aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-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