diff options
| author |   Fatih Degirmenci <fdegir@gmail.com> | 2017-12-20 22:35:04 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-12-20 22:35:04 +0000 |
| commit | 8662864a166d9e89ba8058c871526b3ad94aae21 (patch) | |
| tree | 61b0ba11885947a762bfe18214175efcdbcd0116 /xci/playbooks | |
| parent | 460e629b50db8299e91f27216f2a5abd7995b425 (diff) | |
| parent | e459bf585793de447f0db0079f3faf37a19380d5 (diff) | |
Merge "Rename variable OPNFV_SCENARIO to DEPLOY_SCENARIO"
Diffstat (limited to 'xci/playbooks')
| -rw-r--r-- | xci/playbooks/bootstrap-scenarios.yml | 8 | ||||
| -rw-r--r-- | xci/playbooks/get-opnfv-scenario-requirements.yml | 8 |
2 files changed, 8 insertions, 8 deletions
diff --git a/xci/playbooks/bootstrap-scenarios.yml b/xci/playbooks/bootstrap-scenarios.yml index 50f7b246..98acf73b 100644 --- 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 173b825e..944bf53c 100644 --- 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 ;-) - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ |