Rename variable OPNFV_SCENARIO to DEPLOY_SCENARIO

Rest of the OPNFV projects use the variable DEPLOY_SCENARIO so
XCI should be aligned with them as well even though OPNFV_SCENARIO
fits better than DEPLOY_SCENARIO.

Change-Id: Id48c41fa8a1fa9493cfc7a4906f64b6d8ed27d64
Signed-off-by: Fatih Degirmenci <fdegir@gmail.com>

diff --git a/xci/config/env-vars b/xci/config/env-vars
index 3777bec..8560c99 100755 (executable)
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -33,4 +33,4 @@ export XCI_ANSIBLE_PIP_VERSION=2.3.2.0
 export ANSIBLE_HOST_KEY_CHECKING=False
 # subject of the certificate
 export XCI_SSL_SUBJECT=${XCI_SSL_SUBJECT:-"/C=US/ST=California/L=San Francisco/O=IT/CN=xci.releng.opnfv.org"}
-export OPNFV_SCENARIO=${OPNFV_SCENARIO:-"os-nosdn-nofeature"}
+export DEPLOY_SCENARIO=${DEPLOY_SCENARIO:-"os-nosdn-nofeature"}

diff --git a/xci/playbooks/bootstrap-scenarios.yml b/xci/playbooks/bootstrap-scenarios.yml
index 50f7b24..98acf73 100644 (file)
--- a/xci/playbooks/bootstrap-scenarios.yml
+++ b/xci/playbooks/bootstrap-scenarios.yml
@@ -7,17 +7,17 @@
 # - name: Include foobar role
 #   include_role:
 #     name: "foobar"
-#   when: OPNFV_SCENARIO == "foobar"
+#   when: DEPLOY_SCENARIO == "foobar"
 
 - name: Prepare everything to run the os-nosdn-nofeature scenario
   include_role:
     name: "os-nosdn-nofeature"
-  when: OPNFV_SCENARIO == 'os-nosdn-nofeature'
+  when: DEPLOY_SCENARIO == 'os-nosdn-nofeature'
 - name: Prepare everything to run the os-odl-nofeature scenario
   include_role:
     name: "os-odl-nofeature"
-  when: OPNFV_SCENARIO == 'os-odl-nofeature'
+  when: DEPLOY_SCENARIO == 'os-odl-nofeature'
 - name: Prepare everything to run the os-odl-sfc scenario
   include_role:
     name: "os-odl-sfc"
-  when: OPNFV_SCENARIO == 'os-odl-sfc'
+  when: DEPLOY_SCENARIO == 'os-odl-sfc'

diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml
index 173b825..944bf53 100644 (file)
--- a/xci/playbooks/get-opnfv-scenario-requirements.yml
+++ b/xci/playbooks/get-opnfv-scenario-requirements.yml
@@ -83,19 +83,19 @@
       loop_control:
         label: "{{ item.item.scenario }}"
 
-    - name: Determine if selected {{ OPNFV_SCENARIO }} scenario can be deployed
+    - name: Determine if selected {{ DEPLOY_SCENARIO }} scenario can be deployed
       set_fact:
         deploy_scenario_on_flavor: XCI_FLAVOR in item.flavors
-      when: OPNFV_SCENARIO == item.scenario
+      when: DEPLOY_SCENARIO == item.scenario
       with_items: "{{ scenarios }}"
       loop_control:
         label: "{{ item.scenario }}"
 
-    - name: Fail if {{ XCI_FLAVOR }} is not supported in {{ OPNFV_SCENARIO }}
+    - name: Fail if {{ XCI_FLAVOR }} is not supported in {{ DEPLOY_SCENARIO }}
       fail:
         msg:
           - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-          - ERROR! The {{ OPNFV_SCENARIO }} scenario does not support the {{ XCI_FLAVOR }}
+          - ERROR! The {{ DEPLOY_SCENARIO }} scenario does not support the {{ XCI_FLAVOR }}
           - ''
           - This is a great chance for you to contribute to XCI ;-)
           - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

diff --git a/xci/scenarios/os-odl-nofeature/xci_overrides b/xci/scenarios/os-odl-nofeature/xci_overrides
index ed6c448..2c65df0 100644 (file)
--- a/xci/scenarios/os-odl-nofeature/xci_overrides
+++ b/xci/scenarios/os-odl-nofeature/xci_overrides
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-if [[ $OPNFV_SCENARIO == "os-odl-nofeature" ]] && [[ $XCI_FLAVOR == "ha" ]]; then
+if [[ $DEPLOY_SCENARIO == "os-odl-nofeature" ]] && [[ $XCI_FLAVOR == "ha" ]]; then
     export VM_MEMORY_SIZE=20480
-elif [[ $OPNFV_SCENARIO == "os-odl-nofeature" ]]; then
+elif [[ $DEPLOY_SCENARIO == "os-odl-nofeature" ]]; then
     export VM_MEMORY_SIZE=16384
-fi
\ No newline at end of file
+fi

diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index 19a5cca..6d28833 100644 (file)
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -32,7 +32,7 @@ XCI_EXTRA_VARS_PATH: "{{ lookup('env', 'XCI_EXTRA_VARS_PATH') }}"
 XCI_SSL_SUBJECT: "{{ lookup('env', 'XCI_SSL_SUBJECT') }}"
 XCI_CEPH_ENABLED: "{{ lookup('env', 'XCI_CEPH_ENABLED') }}"
 RUN_TEMPEST: "{{ lookup('env', 'RUN_TEMPEST') }}"
-OPNFV_SCENARIO: "{{ lookup('env','OPNFV_SCENARIO') }}"
+DEPLOY_SCENARIO: "{{ lookup('env','DEPLOY_SCENARIO') }}"
 
 # install docker on opnfv host only if we are running as part of CI
 opnfv_required_packages:

diff --git a/xci/xci-deploy.sh b/xci/xci-deploy.sh
index 3f28e48..89fb455 100755 (executable)
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -91,7 +91,7 @@ echo "xci nfvi: $XCI_NFVI"
 echo "opnfv/releng-xci version: $(git rev-parse HEAD)"
 echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION"
 echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION"
-echo "OPNFV scenario: $OPNFV_SCENARIO"
+echo "OPNFV scenario: $DEPLOY_SCENARIO"
 echo "-------------------------------------------------------------------------"
 
 #-------------------------------------------------------------------------------
@@ -147,8 +147,8 @@ echo "-------------------------------------------------------------------------"
 #-------------------------------------------------------------------------------
 # Get scenario variables overrides
 #-------------------------------------------------------------------------------
-if [[ -f $XCI_SCENARIOS_CACHE/${OPNFV_SCENARIO:-_no_scenario_}/xci_overrides ]]; then
-    source $XCI_SCENARIOS_CACHE/$OPNFV_SCENARIO/xci_overrides
+if [[ -f $XCI_SCENARIOS_CACHE/${DEPLOY_SCENARIO:-_no_scenario_}/xci_overrides ]]; then
+    source $XCI_SCENARIOS_CACHE/$DEPLOY_SCENARIO/xci_overrides
 fi
 
 #-------------------------------------------------------------------------------