[mcp] Set default address for salt master

Change-Id: Iaa9cd3d5734fbf81a224d00ee006b63a66a915f0
Signed-off-by: Michael Polenchuk <mpolenchuk@mirantis.com>

diff --git a/ci/deploy.sh b/ci/deploy.sh
index 54b0902..8389bc0 100755 (executable)
--- 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
index e1bf38c..a0317fc 160000 (submodule)
--- a/mcp/reclass/classes/system
+++ b/mcp/reclass/classes/system
@@ -1 +1 @@
-Subproject commit e1bf38ccfd44662c806fe6c7b652b988bc0d6f24
+Subproject commit a0317fccebde8b0c557719bce7e6c57dff0b2bc2