Modify full-deploy-ovb to use common settings and nodes files

Depends-On: Ia1eb7fe53eef3b739390af73936237ca643619fd
Change-Id: I3845e5da2e41759f69bb9d033222b2e3a85c58d2

ci-scripts/full-deploy-ovb.sh

@@ -70,11 +70,8 @@ if [[ $CUSTOM_REQUIREMENTS_INSTALL != "none" ]] && [[ ! $(grep "$CUSTOM_REQUIREM
     echo "$CUSTOM_REQUIREMENTS_INSTALL" >> $CI_SCRIPT_DIR/../quickstart-extras-requirements.txt
 fi
 
-# FIXME (rlandy) - We are not able to use the topology files
-# in config/nodes/ for OVB due to the definition of the
-# overcloud nodes. As a workaround, pass the $CONFIG file,
-# which also contains the overcloud nodes settings, to $OPT_NODES
-export OPT_NODES=${OPT_NODES:="$WORKSPACE/config/general_config/${CONFIG}.yml"}
+#  Define nodes
+export OPT_NODES=${OPT_NODES:="$WORKSPACE/config/nodes/1ctlr_1comp.yml"}
 
 # We need to run differently when gating upstream changes
 if [ "$JOB_TYPE" = "dlrn-gate" ] || [ "$JOB_TYPE" = "dlrn-gate-check" ]; then
@@ -84,6 +81,7 @@ if [ "$JOB_TYPE" = "dlrn-gate" ] || [ "$JOB_TYPE" = "dlrn-gate-check" ]; then
         --tags all \
         --no-clone \
         --extra-vars build_test_packages="true" \
+        --extra-vars @$WORKSPACE/config/environments/ovb-common.yml \
         --config $WORKSPACE/config/general_config/${CONFIG}.yml \
         --environment $WORKSPACE/config/environments/${ENVIRONMENT}.yml \
         --extra-vars cleanup_stacks_keypairs=$DELETE_ALL_STACKS \
@@ -97,6 +95,7 @@ else
         --working-dir $WORKSPACE/ \
         --tags all \
         --no-clone \
+        --extra-vars @$WORKSPACE/config/environments/ovb-common.yml \
         --config $WORKSPACE/config/general_config/${CONFIG}.yml \
         --environment $WORKSPACE/config/environments/${ENVIRONMENT}.yml \
         --extra-vars cleanup_stacks_keypairs=$DELETE_ALL_STACKS \

config/nodes/ovb_4node.yml

@@ -1,2 +0,0 @@
-node_count: 4
-