summaryrefslogtreecommitdiffstats
path: root/mcp/reclass/scripts/salt.sh
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-05-29 13:36:25 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-05-29 15:02:16 +0400
commitecfbd90af36439bcb51ec2cace0d0d2340e9fee1 (patch)
treeeadcf7cc49c6a7f6932ed44f528b33c03f180551 /mcp/reclass/scripts/salt.sh
parentf85c84133c2f8d6aec3c707cfb92cb03db543bd6 (diff)
[mcp] Mend installation scripts
* add/unify ssh options * get base image to temporary directory * specify os type for virt install * fix symbolic link to reclass * remove outdated fuel submodules Change-Id: I6833ce78c8fff97e1b89f4e92e6e6b470e9ce99f Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
Diffstat (limited to 'mcp/reclass/scripts/salt.sh')
-rwxr-xr-xmcp/reclass/scripts/salt.sh4
1 files changed, 2 insertions, 2 deletions
diff --git a/mcp/reclass/scripts/salt.sh b/mcp/reclass/scripts/salt.sh
index 6495bbce2..6c60c5662 100755
--- a/mcp/reclass/scripts/salt.sh
+++ b/mcp/reclass/scripts/salt.sh
@@ -4,7 +4,7 @@
#
# ssh to cfg01
-ssh -i mcp.rsa ubuntu@192.168.10.100 bash -s << SALT_INSTALL_END
+ssh $SSH_OPTS ubuntu@$SALT_MASTER bash -s << SALT_INSTALL_END
sudo -i
apt-get update
@@ -12,7 +12,7 @@ ssh -i mcp.rsa ubuntu@192.168.10.100 bash -s << SALT_INSTALL_END
svn export --force https://github.com/salt-formulas/salt-formulas/trunk/deploy/scripts /srv/salt/scripts
git clone --depth=1 --recurse-submodules https://git.opnfv.org/fuel
- ln -s $(pwd)/fuel/mcp/reclass /srv/salt/reclass
+ 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