diff options
Diffstat (limited to 'xci/playbooks')
| -rw-r--r-- | xci/playbooks/configure-localhost.yml | 12 | ||||
| -rw-r--r-- | xci/playbooks/get-opnfv-scenario-requirements.yml | 4 |
2 files changed, 8 insertions, 8 deletions
diff --git a/xci/playbooks/configure-localhost.yml b/xci/playbooks/configure-localhost.yml index 467ab312..a5b0e3fa 100644 --- a/xci/playbooks/configure-localhost.yml +++ b/xci/playbooks/configure-localhost.yml @@ -35,33 +35,33 @@ repo: "{{ OPENSTACK_OSA_OPENRC_GIT_URL }}" dest: roles/openstack-ansible-openstack_openrc version: "master" - when: XCI_INSTALLER == "osa" + when: INSTALLER_TYPE == "osa" - role: clone-repository project: "openstack/openstack-ansible" repo: "{{ OPENSTACK_OSA_GIT_URL }}" dest: "{{ XCI_CACHE }}/repos/openstack-ansible" version: "{{ OPENSTACK_OSA_VERSION }}" - when: XCI_INSTALLER == "osa" + when: INSTALLER_TYPE == "osa" - role: clone-repository project: "kubernetes-incubator/kubespray" repo: "{{ KUBESPRAY_GIT_URL }}" dest: "{{ XCI_CACHE }}/repos/kubespray" version: "{{ KUBESPRAY_VERSION }}" - when: XCI_INSTALLER == "kubespray" + when: INSTALLER_TYPE == "kubespray" - role: clone-repository project: "openstack/openstack-ansible-haproxy_server" repo: "{{ OPENSTACK_OSA_HAPROXY_GIT_URL }}" dest: roles/haproxy_server version: "{{ HAPROXY_VERSION }}" when: - - XCI_INSTALLER == "kubespray" + - INSTALLER_TYPE == "kubespray" - role: clone-repository project: "ansible-keepalived" repo: "{{ KEEPALIVED_GIT_URL }}" dest: roles/keepalived version: "{{ KEEPALIVED_VERSION }}" when: - - XCI_INSTALLER == "kubespray" + - INSTALLER_TYPE == "kubespray" tasks: - name: create log directory {{LOG_PATH}} @@ -97,4 +97,4 @@ when: - OPENSTACK_OSA_DEV_PATH != "" when: - - XCI_INSTALLER == "osa" + - INSTALLER_TYPE == "osa" diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml index c04348e3..0615fde1 100644 --- a/xci/playbooks/get-opnfv-scenario-requirements.yml +++ b/xci/playbooks/get-opnfv-scenario-requirements.yml @@ -110,7 +110,7 @@ with_items: "{{ deploy_scenario.installers }}" loop_control: label: "{{ item.installer }}" - when: item.installer == XCI_INSTALLER + when: item.installer == INSTALLER_TYPE - set_fact: deploy_scenario_flavor: "{{ (XCI_FLAVOR in deploy_scenario_installer.flavors) | bool }}" when: @@ -128,7 +128,7 @@ msg: - ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ - ERROR! The {{ DEPLOY_SCENARIO }} scenario can't be deployed. This is because - - the {{ XCI_INSTALLER }} XCI installer or the {{ XCI_FLAVOR }} flavor or the {{ XCI_DISTRO }} + - the {{ INSTALLER_TYPE }} 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 }}. - '' |