Add capability to pull in additional quickstart.sh settings

This enables using full-deploy.sh with both downstream CI, as well
as interactive usage for various developer scenarios where one
might wish to pass additional parameters to quickstart.sh

OPT_ADDITIONAL_PARAMETERS will be set to "" only if not defined

Change-Id: I7b697ef289e8b87e10187b158b4b6d2aa4080385

ci-scripts/full-deploy-baremetal.sh

@@ -10,12 +10,13 @@
 
 set -eux
 
+: ${OPT_ADDITIONAL_PARAMETERS:=""}
+
 RELEASE=$1
 HW_ENV_DIR=$2
 NETWORK_ISOLATION=$3
 CONFIG_FILE=$4
 PLAYBOOK=$5
-
 socketdir=$(mktemp -d /tmp/sockXXXXXX)
 export ANSIBLE_SSH_CONTROL_PATH=$socketdir/%%h-%%r
 
@@ -34,4 +35,5 @@ bash quickstart.sh \
     --extra-vars network_environment_file=$WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/${NETWORK_ISOLATION}.yml \
     --extra-vars nic_configs_dir=$WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/nic_configs/ \
     --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
+    $OPT_ADDITIONAL_PARAMETERS \
     $VIRTHOST

ci-scripts/full-deploy-ovb.sh

@@ -12,6 +12,8 @@
 
 set -eux
 
+: ${OPT_ADDITIONAL_PARAMETERS:=""}
+
 RELEASE=$1
 HW_ENV_DIR=$2
 NETWORK_ISOLATION=$3
@@ -36,4 +38,5 @@ bash quickstart.sh \
     --extra-vars @$WORKSPACE/$HW_ENV_DIR/network_configs/$NETWORK_ISOLATION/env_settings.yml \
     --playbook $PLAYBOOK \
     --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
+    $OPT_ADDITIONAL_PARAMETERS \
     localhost

ci-scripts/full-deploy.sh

@@ -5,6 +5,8 @@
 # Usage: full-deploy.sh <release> <build_system> <config> <job_type>
 set -eux
 
+: ${OPT_ADDITIONAL_PARAMETERS:=""}
+
 RELEASE=$1
 # unused variable in script, kept for consistency
 BUILD_SYS=$2
@@ -48,6 +50,7 @@ if [ "$JOB_TYPE" = "roles-gate" ]; then
         --requirements quickstart-extras-requirements.txt \
         --playbook gate-roles.yml \
         --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
+        $OPT_ADDITIONAL_PARAMETERS \
         $VIRTHOST
     # once more to let the gating role be gated as well
     bash quickstart.sh \
@@ -57,6 +60,7 @@ if [ "$JOB_TYPE" = "roles-gate" ]; then
         --requirements quickstart-extras-requirements.txt \
         --playbook gate-roles.yml \
         --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
+        $OPT_ADDITIONAL_PARAMETERS \
         $VIRTHOST
 fi
 
@@ -73,6 +77,7 @@ if [ "$JOB_TYPE" = "dlrn-gate" ]; then
         --tags all \
         --teardown all \
         --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
+        $OPT_ADDITIONAL_PARAMETERS \
         $VIRTHOST
     # skip provisioning and run the gate using the previously built RPMs
     bash quickstart.sh \
@@ -86,6 +91,7 @@ if [ "$JOB_TYPE" = "dlrn-gate" ]; then
         --tags all \
         --teardown none \
         --release ${CI_ENV:+$CI_ENV/}$RELEASE${REL_TYPE:+-$REL_TYPE} \
+        $OPT_ADDITIONAL_PARAMETERS \
         $VIRTHOST
 else
     bash quickstart.sh \
@@ -97,5 +103,6 @@ else
         --bootstrap \
         --requirements quickstart-extras-requirements.txt \
         --playbook quickstart-extras.yml \
+        $OPT_ADDITIONAL_PARAMETERS \
         $VIRTHOST
 fi