Change OS_DEPLOY to OPENSTACK_TOPO

Change-Id: I7bd22a19a53e532cec9599e9920f5867ff9cb948
Signed-off-by: Jamo Luhrsen <jluhrsen@redhat.com>

diff --git a/jjb/integration/common-functions.sh b/jjb/integration/common-functions.sh
index e2066b4153ce550c89515ef9fe8eec664e27d983..4695ccdbe470bda2139c3739f16d12dbff356e58 100644 (file)
--- a/jjb/integration/common-functions.sh
+++ b/jjb/integration/common-functions.sh
@@ -121,16 +121,16 @@ function get_os_deploy() {
     local -r num_systems=${1:-$NUM_OPENSTACK_SYSTEM}
     case ${num_systems} in
     1)
-        OS_DEPLOY="1cmb-0ctl-0cmp"
+        OPENSTACK_TOPO="1cmb-0ctl-0cmp"
         ;;
     2)
-        OS_DEPLOY="1cmb-0ctl-1cmp"
+        OPENSTACK_TOPO="1cmb-0ctl-1cmp"
         ;;
     3|*)
-        OS_DEPLOY="0cmb-1ctl-2cmp"
+        OPENSTACK_TOPO="0cmb-1ctl-2cmp"
         ;;
     esac
-    export OS_DEPLOY
+    export OPENSTACK_TOPO
 }
 
 function run_plan() {

diff --git a/jjb/integration/integration-deploy-openstack-run-test.sh b/jjb/integration/integration-deploy-openstack-run-test.sh
index 22019435a49bed5f0b8e8349ad02db3ff7c78e28..ab62ce905be78f5aa0d83d13a47c2e3696146095 100644 (file)
--- a/jjb/integration/integration-deploy-openstack-run-test.sh
+++ b/jjb/integration/integration-deploy-openstack-run-test.sh
@@ -1151,7 +1151,7 @@ for suite in ${SUITES}; do
     -v OS_COMPUTE_4_IP:${OPENSTACK_COMPUTE_NODE_4_IP} \
     -v OS_COMPUTE_5_IP:${OPENSTACK_COMPUTE_NODE_5_IP} \
     -v OS_COMPUTE_6_IP:${OPENSTACK_COMPUTE_NODE_6_IP} \
-    -v OS_DEPLOY:${OS_DEPLOY} \
+    -v OPENSTACK_TOPO:${OPENSTACK_TOPO} \
     -v OS_USER:${USER} \
     -v PUBLIC_PHYSICAL_NETWORK:${PUBLIC_PHYSICAL_NETWORK} \
     -v SECURITY_GROUP_MODE:${SECURITY_GROUP_MODE} \