From 11ed1a95653d61a0eb4823bb512b78c03d1a6664 Mon Sep 17 00:00:00 2001 From: Michael Mrowetz Date: Tue, 31 Jan 2017 14:32:16 +0900 Subject: [PATCH] #40721 openstack-heat: salt-minion not daemonize openstack-heat does currently not setup a salt-master, so it is not necessary to daemonize it. --- .../openstack-heat/kubernetes-heat/fragments/run-salt.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh b/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh index 82ace6f358b..f76b1849faa 100644 --- a/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh +++ b/cluster/openstack-heat/kubernetes-heat/fragments/run-salt.sh @@ -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 .