aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Polenchuk <mpolenchuk@mirantis.com>2017-06-19 18:42:39 +0400
committerMichael Polenchuk <mpolenchuk@mirantis.com>2017-06-19 19:26:36 +0400
commit5b6ef486ab10ed93d5212daa64edeb59cd2c71ff (patch)
tree7685025902a8b321c33c7c6f5a03e3405294ae45
parent4f68016daa6b8bff677b9915b411fda388f5505d (diff)
[mcp] Set default address for salt master
Change-Id: Iaa9cd3d5734fbf81a224d00ee006b63a66a915f0 Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>
-rwxr-xr-xci/deploy.sh6
m---------mcp/reclass/classes/system0
2 files changed, 3 insertions, 3 deletions
diff --git a/ci/deploy.sh b/ci/deploy.sh
index 54b090254..8389bc0c8 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -247,8 +247,8 @@ case $DEPLOY_SCENARIO in
esac
export CLUSTER_DOMAIN
-export SSH_KEY=mcp.rsa
-export SALT_MASTER=$SALT_MASTER_IP
+export SSH_KEY=${SSH_KEY:-mcp.rsa}
+export SALT_MASTER=${SALT_MASTER_IP:-192.168.10.100}
export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${SSH_KEY}"
./infra.sh
@@ -256,7 +256,7 @@ export SSH_OPTS="-o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i
./openstack.sh
# enable dpdk on computes
-[[ $DEPLOY_SCENARIO =~ dpdk ]] && ./dpdk.sh
+[[ "$DEPLOY_SCENARIO" =~ dpdk ]] && ./dpdk.sh
## Disable Fuel deployment engine
#
diff --git a/mcp/reclass/classes/system b/mcp/reclass/classes/system
-Subproject e1bf38ccfd44662c806fe6c7b652b988bc0d6f2
+Subproject a0317fccebde8b0c557719bce7e6c57dff0b2bc