aboutsummaryrefslogtreecommitdiffstats
path: root/mcp/reclass/scripts/salt.sh
diff options
context:
space:
mode:
Diffstat (limited to 'mcp/reclass/scripts/salt.sh')
-rwxr-xr-xmcp/reclass/scripts/salt.sh7
1 files changed, 5 insertions, 2 deletions
diff --git a/mcp/reclass/scripts/salt.sh b/mcp/reclass/scripts/salt.sh
index 6c60c5662..b6f844e83 100755
--- a/mcp/reclass/scripts/salt.sh
+++ b/mcp/reclass/scripts/salt.sh
@@ -7,7 +7,10 @@
ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << SALT_INSTALL_END
sudo -i
- apt-get update
+ echo -n 'Checking out cloud-init has finished running ...'
+ while [ ! -f /var/lib/cloud/instance/boot-finished ]; do echo -n '.'; sleep 1; done
+ echo ' done'
+
apt-get install -y git curl subversion
svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts
@@ -15,6 +18,6 @@ ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << SALT_INSTALL_END
ln -s /root/fuel/mcp/reclass /srv/salt/reclass
cd /srv/salt/scripts
- MASTER_HOSTNAME=cfg01.virtual-mcp-ocata-ovs.local ./salt-master-init.sh
+ MASTER_HOSTNAME=cfg01.${CLUSTER_DOMAIN} ./salt-master-init.sh
salt-key -Ay
SALT_INSTALL_END