summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xxci/config/env-vars2
-rwxr-xr-xxci/config/user-vars2
-rwxr-xr-xxci/installer/osa/deploy.sh (renamed from xci/nfvi/osa/nfvi-deploy.sh)0
-rw-r--r--xci/installer/osa/files/aio/flavor-vars.yml (renamed from xci/nfvi/osa/files/aio/flavor-vars.yml)0
-rw-r--r--xci/installer/osa/files/aio/inventory (renamed from xci/nfvi/osa/files/aio/inventory)0
-rw-r--r--xci/installer/osa/files/ansible-role-requirements.yml (renamed from xci/nfvi/osa/files/ansible-role-requirements.yml)0
-rw-r--r--xci/installer/osa/files/cinder.yml (renamed from xci/nfvi/osa/files/cinder.yml)0
-rw-r--r--xci/installer/osa/files/global-requirement-pins.txt (renamed from xci/nfvi/osa/files/global-requirement-pins.txt)0
-rw-r--r--xci/installer/osa/files/ha/ceph.yml (renamed from xci/nfvi/osa/files/ha/ceph.yml)0
-rw-r--r--xci/installer/osa/files/ha/flavor-vars.yml (renamed from xci/nfvi/osa/files/ha/flavor-vars.yml)0
-rw-r--r--xci/installer/osa/files/ha/inventory (renamed from xci/nfvi/osa/files/ha/inventory)0
-rw-r--r--xci/installer/osa/files/ha/openstack_user_config.yml (renamed from xci/nfvi/osa/files/ha/openstack_user_config.yml)0
-rw-r--r--xci/installer/osa/files/ha/user_ceph.yml (renamed from xci/nfvi/osa/files/ha/user_ceph.yml)0
-rw-r--r--xci/installer/osa/files/ha/user_variables.yml (renamed from xci/nfvi/osa/files/ha/user_variables.yml)0
-rw-r--r--xci/installer/osa/files/ha/user_variables_ceph.yml (renamed from xci/nfvi/osa/files/ha/user_variables_ceph.yml)0
-rw-r--r--xci/installer/osa/files/mini/ceph.yml (renamed from xci/nfvi/osa/files/mini/ceph.yml)0
-rw-r--r--xci/installer/osa/files/mini/flavor-vars.yml (renamed from xci/nfvi/osa/files/mini/flavor-vars.yml)0
-rw-r--r--xci/installer/osa/files/mini/inventory (renamed from xci/nfvi/osa/files/mini/inventory)0
-rw-r--r--xci/installer/osa/files/mini/openstack_user_config.yml (renamed from xci/nfvi/osa/files/mini/openstack_user_config.yml)0
-rw-r--r--xci/installer/osa/files/mini/user_ceph.yml (renamed from xci/nfvi/osa/files/mini/user_ceph.yml)0
-rw-r--r--xci/installer/osa/files/mini/user_variables.yml (renamed from xci/nfvi/osa/files/mini/user_variables.yml)0
-rw-r--r--xci/installer/osa/files/mini/user_variables_ceph.yml (renamed from xci/nfvi/osa/files/mini/user_variables_ceph.yml)0
-rw-r--r--xci/installer/osa/files/noha/ceph.yml (renamed from xci/nfvi/osa/files/noha/ceph.yml)0
-rw-r--r--xci/installer/osa/files/noha/flavor-vars.yml (renamed from xci/nfvi/osa/files/noha/flavor-vars.yml)0
-rw-r--r--xci/installer/osa/files/noha/inventory (renamed from xci/nfvi/osa/files/noha/inventory)0
-rw-r--r--xci/installer/osa/files/noha/openstack_user_config.yml (renamed from xci/nfvi/osa/files/noha/openstack_user_config.yml)0
-rw-r--r--xci/installer/osa/files/noha/user_ceph.yml (renamed from xci/nfvi/osa/files/noha/user_ceph.yml)0
-rw-r--r--xci/installer/osa/files/noha/user_variables.yml (renamed from xci/nfvi/osa/files/noha/user_variables.yml)0
-rw-r--r--xci/installer/osa/files/noha/user_variables_ceph.yml (renamed from xci/nfvi/osa/files/noha/user_variables_ceph.yml)0
-rw-r--r--xci/installer/osa/files/openstack_services.yml (renamed from xci/nfvi/osa/files/openstack_services.yml)0
-rw-r--r--xci/installer/osa/files/setup-openstack.yml (renamed from xci/nfvi/osa/files/setup-openstack.yml)0
-rw-r--r--xci/installer/osa/playbooks/bootstrap-scenarios.yml (renamed from xci/nfvi/osa/playbooks/bootstrap-scenarios.yml)0
-rw-r--r--xci/installer/osa/playbooks/configure-localhost.yml (renamed from xci/nfvi/osa/playbooks/configure-localhost.yml)0
-rw-r--r--xci/installer/osa/playbooks/configure-opnfvhost.yml (renamed from xci/nfvi/osa/playbooks/configure-opnfvhost.yml)10
-rw-r--r--xci/installer/osa/playbooks/configure-targethosts.yml (renamed from xci/nfvi/osa/playbooks/configure-targethosts.yml)0
-rw-r--r--xci/installer/osa/playbooks/inventory (renamed from xci/nfvi/osa/playbooks/inventory)0
-rw-r--r--xci/opnfv-scenario-requirements.yml12
-rw-r--r--xci/playbooks/get-opnfv-scenario-requirements.yml18
-rwxr-xr-xxci/scripts/update-osa-version-files.sh14
-rw-r--r--xci/var/opnfv.yml2
-rwxr-xr-xxci/xci-deploy.sh14
41 files changed, 37 insertions, 37 deletions
diff --git a/xci/config/env-vars b/xci/config/env-vars
index b4a4016..c7744ca 100755
--- a/xci/config/env-vars
+++ b/xci/config/env-vars
@@ -8,7 +8,7 @@ export OPENSTACK_OSA_GIT_URL=https://git.openstack.org/openstack/openstack-ansib
export OPENSTACK_OSA_OPENRC_GIT_URL=https://git.openstack.org/openstack/openstack-ansible-openstack_openrc
export OPENSTACK_OSA_ETC_PATH=/etc/openstack_deploy
export OPNFV_HOST_IP=192.168.122.2
-export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/nfvi/$XCI_NFVI/files/$XCI_FLAVOR
+export XCI_FLAVOR_ANSIBLE_FILE_PATH=$XCI_PATH/xci/installer/$XCI_INSTALLER/files/$XCI_FLAVOR
export CI_LOOP=${CI_LOOP:-daily}
export JOB_NAME=${JOB_NAME:-false}
# XCI_CACHE is a cache on localhost where repositories and scenarios are cloned.
diff --git a/xci/config/user-vars b/xci/config/user-vars
index da3528f..64f2882 100755
--- a/xci/config/user-vars
+++ b/xci/config/user-vars
@@ -23,7 +23,7 @@
export XCI_FLAVOR=${XCI_FLAVOR:-aio}
export XCI_DISTRO=${XCI_DISTRO:-$(source /etc/os-release &>/dev/null || source /usr/lib/os-release &>/dev/null; echo ${ID,,})}
export XCI_CEPH_ENABLED=${XCI_CEPH_ENABLED:-false}
-export XCI_NFVI=${XCI_NFVI:-osa}
+export XCI_INSTALLER=${XCI_INSTALLER:-osa}
#-------------------------------------------------------------------------------
# Configure some other stuff
diff --git a/xci/nfvi/osa/nfvi-deploy.sh b/xci/installer/osa/deploy.sh
index b8637f2..b8637f2 100755
--- a/xci/nfvi/osa/nfvi-deploy.sh
+++ b/xci/installer/osa/deploy.sh
diff --git a/xci/nfvi/osa/files/aio/flavor-vars.yml b/xci/installer/osa/files/aio/flavor-vars.yml
index 6ac1e0f..6ac1e0f 100644
--- a/xci/nfvi/osa/files/aio/flavor-vars.yml
+++ b/xci/installer/osa/files/aio/flavor-vars.yml
diff --git a/xci/nfvi/osa/files/aio/inventory b/xci/installer/osa/files/aio/inventory
index 9a3dd9e..9a3dd9e 100644
--- a/xci/nfvi/osa/files/aio/inventory
+++ b/xci/installer/osa/files/aio/inventory
diff --git a/xci/nfvi/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml
index 329d24a..329d24a 100644
--- a/xci/nfvi/osa/files/ansible-role-requirements.yml
+++ b/xci/installer/osa/files/ansible-role-requirements.yml
diff --git a/xci/nfvi/osa/files/cinder.yml b/xci/installer/osa/files/cinder.yml
index e40b392..e40b392 100644
--- a/xci/nfvi/osa/files/cinder.yml
+++ b/xci/installer/osa/files/cinder.yml
diff --git a/xci/nfvi/osa/files/global-requirement-pins.txt b/xci/installer/osa/files/global-requirement-pins.txt
index aa3b116..aa3b116 100644
--- a/xci/nfvi/osa/files/global-requirement-pins.txt
+++ b/xci/installer/osa/files/global-requirement-pins.txt
diff --git a/xci/nfvi/osa/files/ha/ceph.yml b/xci/installer/osa/files/ha/ceph.yml
index 1567c49..1567c49 100644
--- a/xci/nfvi/osa/files/ha/ceph.yml
+++ b/xci/installer/osa/files/ha/ceph.yml
diff --git a/xci/nfvi/osa/files/ha/flavor-vars.yml b/xci/installer/osa/files/ha/flavor-vars.yml
index 167502c..167502c 100644
--- a/xci/nfvi/osa/files/ha/flavor-vars.yml
+++ b/xci/installer/osa/files/ha/flavor-vars.yml
diff --git a/xci/nfvi/osa/files/ha/inventory b/xci/installer/osa/files/ha/inventory
index 94b1d07..94b1d07 100644
--- a/xci/nfvi/osa/files/ha/inventory
+++ b/xci/installer/osa/files/ha/inventory
diff --git a/xci/nfvi/osa/files/ha/openstack_user_config.yml b/xci/installer/osa/files/ha/openstack_user_config.yml
index 360aa5c..360aa5c 100644
--- a/xci/nfvi/osa/files/ha/openstack_user_config.yml
+++ b/xci/installer/osa/files/ha/openstack_user_config.yml
diff --git a/xci/nfvi/osa/files/ha/user_ceph.yml b/xci/installer/osa/files/ha/user_ceph.yml
index 9d5f13a..9d5f13a 100644
--- a/xci/nfvi/osa/files/ha/user_ceph.yml
+++ b/xci/installer/osa/files/ha/user_ceph.yml
diff --git a/xci/nfvi/osa/files/ha/user_variables.yml b/xci/installer/osa/files/ha/user_variables.yml
index 72960a0..72960a0 100644
--- a/xci/nfvi/osa/files/ha/user_variables.yml
+++ b/xci/installer/osa/files/ha/user_variables.yml
diff --git a/xci/nfvi/osa/files/ha/user_variables_ceph.yml b/xci/installer/osa/files/ha/user_variables_ceph.yml
index 8f70899..8f70899 100644
--- a/xci/nfvi/osa/files/ha/user_variables_ceph.yml
+++ b/xci/installer/osa/files/ha/user_variables_ceph.yml
diff --git a/xci/nfvi/osa/files/mini/ceph.yml b/xci/installer/osa/files/mini/ceph.yml
index 5c09b47..5c09b47 100644
--- a/xci/nfvi/osa/files/mini/ceph.yml
+++ b/xci/installer/osa/files/mini/ceph.yml
diff --git a/xci/nfvi/osa/files/mini/flavor-vars.yml b/xci/installer/osa/files/mini/flavor-vars.yml
index 0d446ba..0d446ba 100644
--- a/xci/nfvi/osa/files/mini/flavor-vars.yml
+++ b/xci/installer/osa/files/mini/flavor-vars.yml
diff --git a/xci/nfvi/osa/files/mini/inventory b/xci/installer/osa/files/mini/inventory
index eb73e5e..eb73e5e 100644
--- a/xci/nfvi/osa/files/mini/inventory
+++ b/xci/installer/osa/files/mini/inventory
diff --git a/xci/nfvi/osa/files/mini/openstack_user_config.yml b/xci/installer/osa/files/mini/openstack_user_config.yml
index f9ccee2..f9ccee2 100644
--- a/xci/nfvi/osa/files/mini/openstack_user_config.yml
+++ b/xci/installer/osa/files/mini/openstack_user_config.yml
diff --git a/xci/nfvi/osa/files/mini/user_ceph.yml b/xci/installer/osa/files/mini/user_ceph.yml
index 9d5f13a..9d5f13a 100644
--- a/xci/nfvi/osa/files/mini/user_ceph.yml
+++ b/xci/installer/osa/files/mini/user_ceph.yml
diff --git a/xci/nfvi/osa/files/mini/user_variables.yml b/xci/installer/osa/files/mini/user_variables.yml
index 9ec9e40..9ec9e40 100644
--- a/xci/nfvi/osa/files/mini/user_variables.yml
+++ b/xci/installer/osa/files/mini/user_variables.yml
diff --git a/xci/nfvi/osa/files/mini/user_variables_ceph.yml b/xci/installer/osa/files/mini/user_variables_ceph.yml
index 8f70899..8f70899 100644
--- a/xci/nfvi/osa/files/mini/user_variables_ceph.yml
+++ b/xci/installer/osa/files/mini/user_variables_ceph.yml
diff --git a/xci/nfvi/osa/files/noha/ceph.yml b/xci/installer/osa/files/noha/ceph.yml
index 0deb522..0deb522 100644
--- a/xci/nfvi/osa/files/noha/ceph.yml
+++ b/xci/installer/osa/files/noha/ceph.yml
diff --git a/xci/nfvi/osa/files/noha/flavor-vars.yml b/xci/installer/osa/files/noha/flavor-vars.yml
index 3c69a34..3c69a34 100644
--- a/xci/nfvi/osa/files/noha/flavor-vars.yml
+++ b/xci/installer/osa/files/noha/flavor-vars.yml
diff --git a/xci/nfvi/osa/files/noha/inventory b/xci/installer/osa/files/noha/inventory
index b4f9f6d..b4f9f6d 100644
--- a/xci/nfvi/osa/files/noha/inventory
+++ b/xci/installer/osa/files/noha/inventory
diff --git a/xci/nfvi/osa/files/noha/openstack_user_config.yml b/xci/installer/osa/files/noha/openstack_user_config.yml
index fb12655..fb12655 100644
--- a/xci/nfvi/osa/files/noha/openstack_user_config.yml
+++ b/xci/installer/osa/files/noha/openstack_user_config.yml
diff --git a/xci/nfvi/osa/files/noha/user_ceph.yml b/xci/installer/osa/files/noha/user_ceph.yml
index 9d5f13a..9d5f13a 100644
--- a/xci/nfvi/osa/files/noha/user_ceph.yml
+++ b/xci/installer/osa/files/noha/user_ceph.yml
diff --git a/xci/nfvi/osa/files/noha/user_variables.yml b/xci/installer/osa/files/noha/user_variables.yml
index 6657342..6657342 100644
--- a/xci/nfvi/osa/files/noha/user_variables.yml
+++ b/xci/installer/osa/files/noha/user_variables.yml
diff --git a/xci/nfvi/osa/files/noha/user_variables_ceph.yml b/xci/installer/osa/files/noha/user_variables_ceph.yml
index 8f70899..8f70899 100644
--- a/xci/nfvi/osa/files/noha/user_variables_ceph.yml
+++ b/xci/installer/osa/files/noha/user_variables_ceph.yml
diff --git a/xci/nfvi/osa/files/openstack_services.yml b/xci/installer/osa/files/openstack_services.yml
index 8650163..8650163 100644
--- a/xci/nfvi/osa/files/openstack_services.yml
+++ b/xci/installer/osa/files/openstack_services.yml
diff --git a/xci/nfvi/osa/files/setup-openstack.yml b/xci/installer/osa/files/setup-openstack.yml
index c2cb1c7..c2cb1c7 100644
--- a/xci/nfvi/osa/files/setup-openstack.yml
+++ b/xci/installer/osa/files/setup-openstack.yml
diff --git a/xci/nfvi/osa/playbooks/bootstrap-scenarios.yml b/xci/installer/osa/playbooks/bootstrap-scenarios.yml
index 98acf73..98acf73 100644
--- a/xci/nfvi/osa/playbooks/bootstrap-scenarios.yml
+++ b/xci/installer/osa/playbooks/bootstrap-scenarios.yml
diff --git a/xci/nfvi/osa/playbooks/configure-localhost.yml b/xci/installer/osa/playbooks/configure-localhost.yml
index caa5d67..caa5d67 100644
--- a/xci/nfvi/osa/playbooks/configure-localhost.yml
+++ b/xci/installer/osa/playbooks/configure-localhost.yml
diff --git a/xci/nfvi/osa/playbooks/configure-opnfvhost.yml b/xci/installer/osa/playbooks/configure-opnfvhost.yml
index 7f0e43f..de922d3 100644
--- a/xci/nfvi/osa/playbooks/configure-opnfvhost.yml
+++ b/xci/installer/osa/playbooks/configure-opnfvhost.yml
@@ -22,7 +22,7 @@
- name: Set facts for remote deployment
set_fact:
remote_xci_path: "{{ ansible_env.HOME }}/releng-xci"
- remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/nfvi/{{XCI_NFVI}}/files/{{ XCI_FLAVOR }}"
+ remote_xci_flavor_files: "{{ ansible_env.HOME }}/releng-xci/xci/installer/{{XCI_INSTALLER}}/files/{{ XCI_FLAVOR }}"
remote_xci_playbooks: "{{ ansible_env.HOME }}/releng-xci/xci/playbooks"
roles:
@@ -56,7 +56,7 @@
shell: "/bin/cp -rf {{ remote_xci_flavor_files }}/user_variables.yml {{OPENSTACK_OSA_ETC_PATH}}"
failed_when: false
- name: copy cinder.yml
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/nfvi/osa/files/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d"
+ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/cinder.yml {{OPENSTACK_OSA_ETC_PATH}}/env.d"
- name: Configure AIO tempest
lineinfile:
path: "{{ OPENSTACK_OSA_ETC_PATH }}/user_variables.yml"
@@ -80,16 +80,16 @@
regexp: '(\s+)haproxy_state: disabled'
replace: '\1haproxy_state: enabled'
- name: copy OPNFV OpenStack playbook
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/nfvi/osa/files/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
+ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/setup-openstack.yml {{OPENSTACK_OSA_PATH}}/playbooks"
- name: copy pinned versions of OSA Roles and global requirements
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/nfvi/osa/files/{{ item }} {{OPENSTACK_OSA_PATH}}/{{ item }}"
+ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/{{ item }} {{OPENSTACK_OSA_PATH}}/{{ item }}"
with_items:
- "ansible-role-requirements.yml"
- "global-requirement-pins.txt"
when:
- OPENSTACK_OSA_VERSION != "master"
- name: copy pinned versions of OpenStack services
- shell: "/bin/cp -rf {{ remote_xci_path }}/xci/nfvi/osa/files/openstack_services.yml {{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
+ shell: "/bin/cp -rf {{ remote_xci_path }}/xci/installer/osa/files/openstack_services.yml {{OPENSTACK_OSA_PATH}}/playbooks/defaults/repo_packages/openstack_services.yml"
when:
- OPENSTACK_OSA_VERSION != "master"
- include: bootstrap-scenarios.yml
diff --git a/xci/nfvi/osa/playbooks/configure-targethosts.yml b/xci/installer/osa/playbooks/configure-targethosts.yml
index fb43a92..fb43a92 100644
--- a/xci/nfvi/osa/playbooks/configure-targethosts.yml
+++ b/xci/installer/osa/playbooks/configure-targethosts.yml
diff --git a/xci/nfvi/osa/playbooks/inventory b/xci/installer/osa/playbooks/inventory
index fd9af90..fd9af90 100644
--- a/xci/nfvi/osa/playbooks/inventory
+++ b/xci/installer/osa/playbooks/inventory
diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml
index a250974..929d88e 100644
--- a/xci/opnfv-scenario-requirements.yml
+++ b/xci/opnfv-scenario-requirements.yml
@@ -16,8 +16,8 @@
src: https://gerrit.opnfv.org/gerrit/sfc
version: master
role: scenarios/os-odl-sfc/role/os-odl-sfc
- nfvis:
- - nfvi: osa
+ installers:
+ - installer: osa
flavors:
- ha
- mini
@@ -31,8 +31,8 @@
src: https://git.opnfv.org/releng-xci
version: master
role: xci/scenarios/os-nosdn-nofeature/role/os-nosdn-nofeature
- nfvis:
- - nfvi: osa
+ installers:
+ - installer: osa
flavors:
- ha
- mini
@@ -46,8 +46,8 @@
src: https://git.opnfv.org/releng-xci
version: master
role: xci/scenarios/os-odl-nofeature/role/os-odl-nofeature
- nfvis:
- - nfvi: osa
+ installers:
+ - installer: osa
flavors:
- ha
- mini
diff --git a/xci/playbooks/get-opnfv-scenario-requirements.yml b/xci/playbooks/get-opnfv-scenario-requirements.yml
index f515c25..7eaa43d 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 }}.
- ''
diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh
index 678ad03..a8b0cef 100755
--- a/xci/scripts/update-osa-version-files.sh
+++ b/xci/scripts/update-osa-version-files.sh
@@ -66,8 +66,8 @@ echo """---
# http://www.apache.org/licenses/LICENSE-2.0
##############################################################################
# these versions are based on the osa commit ${1} on $(git --no-pager log -1 --format=%cd --date=format:%Y-%m-%d $1)
-# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=$1""" > $releng_xci_base/nfvi/osa/files/ansible-role-requirements.yml
-cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base/nfvi/osa/files/ansible-role-requirements.yml
+# https://review.openstack.org/gitweb?p=openstack/openstack-ansible.git;a=commit;h=$1""" > $releng_xci_base/installer/osa/files/ansible-role-requirements.yml
+cat $tempdir/openstack-ansible/ansible-role-requirements.yml >> $releng_xci_base/installer/osa/files/ansible-role-requirements.yml
# Update the pinned OSA version
sed -i -e "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" \
@@ -78,8 +78,8 @@ sed -i -e "/^export OPENSTACK_OSA_VERSION/s@:-\"[a-z0-9]*@:-\"${1}@" \
sed -i -e "/^export OPENSTACK_BIFROST_VERSION/s@:-\"[a-z0-9]*@:-\"${2}@" \
-e "s/\(^# HEAD of bifrost.*of \).*/\1$(date +%d\.%m\.%Y)/" $releng_xci_base/config/pinned-versions
-cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/nfvi/osa/files/.
-cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/nfvi/osa/files/.
+cp $tempdir/openstack-ansible/playbooks/defaults/repo_packages/openstack_services.yml ${releng_xci_base}/installer/osa/files/.
+cp $tempdir/openstack-ansible/global-requirement-pins.txt ${releng_xci_base}/installer/osa/files/.
popd &> /dev/null
@@ -87,9 +87,9 @@ printme ""
printme "======================= Report ============================"
printme ""
printme "The following files have been updated:"
-printme "- $releng_xci_base/nfvi/osa/files/ansible-role-requirements.yml"
-printme "- $releng_xci_base/nfvi/osa/files/global-requirement-pins.txt"
-printme "- $releng_xci_base/nfvi/osa/files/openstack_services.yml"
+printme "- $releng_xci_base/installer/osa/files/ansible-role-requirements.yml"
+printme "- $releng_xci_base/installer/osa/files/global-requirement-pins.txt"
+printme "- $releng_xci_base/installer/osa/files/openstack_services.yml"
printme "- $releng_xci_base/config/pinned-versions"
printme "Please make sure you test the end result before committing it!"
printme ""
diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml
index 70c80da..5638eba 100644
--- a/xci/var/opnfv.yml
+++ b/xci/var/opnfv.yml
@@ -34,7 +34,7 @@ XCI_SSL_SUBJECT: "{{ lookup('env', 'XCI_SSL_SUBJECT') }}"
XCI_CEPH_ENABLED: "{{ lookup('env', 'XCI_CEPH_ENABLED') }}"
RUN_TEMPEST: "{{ lookup('env', 'RUN_TEMPEST') }}"
DEPLOY_SCENARIO: "{{ lookup('env','DEPLOY_SCENARIO') }}"
-XCI_NFVI: "{{ lookup('env','XCI_NFVI') }}"
+XCI_INSTALLER: "{{ lookup('env','XCI_INSTALLER') }}"
# 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 e0b31ab..99053c7 100755
--- a/xci/xci-deploy.sh
+++ b/xci/xci-deploy.sh
@@ -22,7 +22,7 @@ submit_bug_report() {
echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION"
echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION"
echo "xci flavor: $XCI_FLAVOR"
- echo "xci nfvi: $XCI_NFVI"
+ echo "xci installer: $XCI_INSTALLER"
echo "Environment variables:"
env | grep --color=never '\(OPNFV\|XCI\|OPENSTACK\)'
echo "-------------------------------------------------------------------------"
@@ -59,8 +59,8 @@ source $XCI_PATH/xci/config/user-vars
source $XCI_PATH/xci/config/pinned-versions
# source flavor configuration
source "$XCI_PATH/xci/config/${XCI_FLAVOR}-vars"
-# source NFVI configuration
-source "$XCI_PATH/xci/nfvi/${XCI_NFVI}/env" &>/dev/null || true
+# source installer configuration
+source "$XCI_PATH/xci/installer/${XCI_INSTALLER}/env" &>/dev/null || true
# source xci configuration
source $XCI_PATH/xci/config/env-vars
@@ -87,7 +87,7 @@ echo "Info: Starting XCI Deployment"
echo "Info: Deployment parameters"
echo "-------------------------------------------------------------------------"
echo "xci flavor: $XCI_FLAVOR"
-echo "xci nfvi: $XCI_NFVI"
+echo "xci installer: $XCI_INSTALLER"
echo "opnfv/releng-xci version: $(git rev-parse HEAD)"
echo "openstack/bifrost version: $OPENSTACK_BIFROST_VERSION"
echo "openstack/openstack-ansible version: $OPENSTACK_OSA_VERSION"
@@ -173,9 +173,9 @@ echo "-----------------------------------------------------------------------"
echo "Info: VM nodes are provisioned!"
echo "-----------------------------------------------------------------------"
-# Deploy OpenStack on the selected NFVI
-echo "Info: Deploying '${XCI_NFVI}' NFVI"
+# Deploy OpenStack on the selected installer
+echo "Info: Deploying '${XCI_INSTALLER}' installer"
echo "-----------------------------------------------------------------------"
-source ${XCI_PATH}/xci/nfvi/${XCI_NFVI}/nfvi-deploy.sh
+source ${XCI_PATH}/xci/installer/${XCI_INSTALLER}/deploy.sh
# vim: set ts=4 sw=4 expandtab: