summaryrefslogtreecommitdiffstats
path: root/ci
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 /ci
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 'ci')
-rwxr-xr-xci/deploy.sh4
1 files changed, 4 insertions, 0 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index bdcd15d99..b6926a7cf 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -240,6 +240,10 @@ pushd ${DEPLOY_DIR} > /dev/null
# Prepare the deploy config files based on lab/pod information, deployment
# scenario, etc.
+export SSH_KEY=mcp.rsa
+export SALT_MASTER=192.168.10.100
+export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
+
./infra.sh
./salt.sh
./openstack.sh