diff options
| author |   Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-05-31 16:12:43 +0400 |
|---|---|---|
| committer | Michael Polenchuk <mpolenchuk@mirantis.com> | 2017-05-31 16:23:36 +0400 |
| commit | f19e006f84e98bdee061d79e68c316364251dcbc (patch) | |
| tree | 3baa59efabe08d993aec82653611dc6eea189eea /mcp/reclass/scripts/salt.sh | |
| parent | ecfbd90af36439bcb51ec2cace0d0d2340e9fee1 (diff) | |
[mcp] Bring in dpdk scenario support
Change-Id: Ifd6d61026a0e98e8faf59c7d218333122d70ffe9
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/scripts/salt.sh')
| -rwxr-xr-x | mcp/reclass/scripts/salt.sh | 7 |
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 |