summaryrefslogtreecommitdiffstats
path: root/xci/playbooks
diff options
context:
space:
mode:
authorMarkos Chandras <mchandras@suse.de>2018-01-08 10:52:57 +0000
committerMarkos Chandras <mchandras@suse.de>2018-01-08 23:24:10 +0000
commit5eaa9da62dabbf31fc83f0c43c6bc56f68468f9c (patch)
treee04ab5e994f5f35a6164ef0f0ce527c2d9012739 /xci/playbooks
parentb4a0a044240a09e621f51d1f12f8f02148870c39 (diff)
xci: Rename 'nfvi' to 'installer'
Using 'installer' to describe the tool that will deploy the foundations of a particular XCI scenario is more appropriate than NFVI which normally describes both the physical and virtual resources needed by an NFV deployment. Change-Id: Ib8b1aac58673bf705ce2ff053574fd10cb390d71 Signed-off-by: Markos Chandras <mchandras@suse.de>
Diffstat (limited to 'xci/playbooks')
-rw-r--r--xci/playbooks/get-opnfv-scenario-requirements.yml18
1 files changed, 9 insertions, 9 deletions
diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml
index f515c253..7eaa43de 100644
--- a/xci/playbooks/get-opnfv-scenario-requirements.yml
+++ b/xci/playbooks/get-opnfv-scenario-requirements.yml
@@ -106,19 +106,19 @@
- name: Determine if the selected {{ DEPLOY_SCENARIO }} scenario can be deployed
block:
- set_fact:
- deploy_scenario_nfvi: "{{ item }}"
- with_items: "{{ deploy_scenario.nfvis }}"
+ deploy_scenario_installer: "{{ item }}"
+ with_items: "{{ deploy_scenario.installers }}"
loop_control:
- label: "{{ item.nfvi }}"
- when: item.nfvi == XCI_NFVI
+ label: "{{ item.installer }}"
+ when: item.installer == XCI_INSTALLER
- set_fact:
- deploy_scenario_flavor: "{{ (XCI_FLAVOR in deploy_scenario_nfvi.flavors) | bool }}"
+ deploy_scenario_flavor: "{{ (XCI_FLAVOR in deploy_scenario_installer.flavors) | bool }}"
when:
- - deploy_scenario_nfvi
+ - deploy_scenario_installer
- set_fact:
- deploy_scenario_distro: "{{ (XCI_DISTRO in deploy_scenario_nfvi.distros) | bool }}"
+ deploy_scenario_distro: "{{ (XCI_DISTRO in deploy_scenario_installer.distros) | bool }}"
when:
- - deploy_scenario_nfvi
+ - deploy_scenario_installer
- deploy_scenario_flavor
when: deploy_scenario is defined
@@ -127,7 +127,7 @@
msg:
- ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
- ERROR! The {{ DEPLOY_SCENARIO }} scenario can't be deployed. This is because
- - the {{ XCI_NFVI }} NFVI or the {{ XCI_FLAVOR }} flavor or the {{ XCI_DISTRO }}
+ - the {{ XCI_INSTALLER }} XCI installer or the {{ XCI_FLAVOR }} flavor or the {{ XCI_DISTRO }}
- distribution is not supported by this scenario. It may also be possible that
- this scenario doesn't exist at all or it's not listed in {{ scenario_file }}.
- ''