github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-29 22:46:12 +00:00
Code Issues Projects Releases Wiki Activity

#40721 openstack-heat: salt-minion not daemonize

Browse Source 
openstack-heat does currently not setup a salt-master, so it is not necessary to  daemonize it.
This commit is contained in:
Michael Mrowetz 2017-01-31 14:32:16 +09:00
parent 99ee9b4b45
commit 11ed1a9565
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh
View File

@ -36,13 +36,15 @@ tar xzf kubernetes-salt.tar.gz
./kubernetes/saltbase/install.sh kubernetes-server.tar.gz
if ! which salt-call >/dev/null 2>&1; then
# Install salt binaries
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s
echo "+++ Install salt binaries from https://bootstrap.saltstack.com"
# Install salt binaries but do not start deamon after installation
curl -sS -L --connect-timeout 20 --retry 6 --retry-delay 10 https://bootstrap.saltstack.com | sh -s -- "-X"
fi
# Salt server runs at locahost
echo "127.0.0.1 salt" >> /etc/hosts
echo "+++ run salt-call and finalize installation"
# Run salt-call
# salt-call wants to start docker daemon but is unable to.
# See <https://github.com/projectatomic/docker-storage-setup/issues/77>.