From 5eaa9da62dabbf31fc83f0c43c6bc56f68468f9c Mon Sep 17 00:00:00 2001 From: Markos Chandras Date: Mon, 8 Jan 2018 10:52:57 +0000 Subject: [PATCH] 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 --- xci/config/env-vars | 2 +- xci/config/user-vars | 2 +- .../osa/nfvi-deploy.sh => installer/osa/deploy.sh} | 0 xci/{nfvi => installer}/osa/files/aio/flavor-vars.yml | 0 xci/{nfvi => installer}/osa/files/aio/inventory | 0 .../osa/files/ansible-role-requirements.yml | 0 xci/{nfvi => installer}/osa/files/cinder.yml | 0 .../osa/files/global-requirement-pins.txt | 0 xci/{nfvi => installer}/osa/files/ha/ceph.yml | 0 xci/{nfvi => installer}/osa/files/ha/flavor-vars.yml | 0 xci/{nfvi => installer}/osa/files/ha/inventory | 0 .../osa/files/ha/openstack_user_config.yml | 0 xci/{nfvi => installer}/osa/files/ha/user_ceph.yml | 0 .../osa/files/ha/user_variables.yml | 0 .../osa/files/ha/user_variables_ceph.yml | 0 xci/{nfvi => installer}/osa/files/mini/ceph.yml | 0 xci/{nfvi => installer}/osa/files/mini/flavor-vars.yml | 0 xci/{nfvi => installer}/osa/files/mini/inventory | 0 .../osa/files/mini/openstack_user_config.yml | 0 xci/{nfvi => installer}/osa/files/mini/user_ceph.yml | 0 .../osa/files/mini/user_variables.yml | 0 .../osa/files/mini/user_variables_ceph.yml | 0 xci/{nfvi => installer}/osa/files/noha/ceph.yml | 0 xci/{nfvi => installer}/osa/files/noha/flavor-vars.yml | 0 xci/{nfvi => installer}/osa/files/noha/inventory | 0 .../osa/files/noha/openstack_user_config.yml | 0 xci/{nfvi => installer}/osa/files/noha/user_ceph.yml | 0 .../osa/files/noha/user_variables.yml | 0 .../osa/files/noha/user_variables_ceph.yml | 0 .../osa/files/openstack_services.yml | 0 xci/{nfvi => installer}/osa/files/setup-openstack.yml | 0 .../osa/playbooks/bootstrap-scenarios.yml | 0 .../osa/playbooks/configure-localhost.yml | 0 .../osa/playbooks/configure-opnfvhost.yml | 10 +++++----- .../osa/playbooks/configure-targethosts.yml | 0 xci/{nfvi => installer}/osa/playbooks/inventory | 0 xci/opnfv-scenario-requirements.yml | 12 ++++++------ xci/playbooks/get-opnfv-scenario-requirements.yml | 18 +++++++++--------- xci/scripts/update-osa-version-files.sh | 14 +++++++------- xci/var/opnfv.yml | 2 +- xci/xci-deploy.sh | 14 +++++++------- 41 files changed, 37 insertions(+), 37 deletions(-) rename xci/{nfvi/osa/nfvi-deploy.sh => installer/osa/deploy.sh} (100%) rename xci/{nfvi => installer}/osa/files/aio/flavor-vars.yml (100%) rename xci/{nfvi => installer}/osa/files/aio/inventory (100%) rename xci/{nfvi => installer}/osa/files/ansible-role-requirements.yml (100%) rename xci/{nfvi => installer}/osa/files/cinder.yml (100%) rename xci/{nfvi => installer}/osa/files/global-requirement-pins.txt (100%) rename xci/{nfvi => installer}/osa/files/ha/ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/ha/flavor-vars.yml (100%) rename xci/{nfvi => installer}/osa/files/ha/inventory (100%) rename xci/{nfvi => installer}/osa/files/ha/openstack_user_config.yml (100%) rename xci/{nfvi => installer}/osa/files/ha/user_ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/ha/user_variables.yml (100%) rename xci/{nfvi => installer}/osa/files/ha/user_variables_ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/mini/ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/mini/flavor-vars.yml (100%) rename xci/{nfvi => installer}/osa/files/mini/inventory (100%) rename xci/{nfvi => installer}/osa/files/mini/openstack_user_config.yml (100%) rename xci/{nfvi => installer}/osa/files/mini/user_ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/mini/user_variables.yml (100%) rename xci/{nfvi => installer}/osa/files/mini/user_variables_ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/noha/ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/noha/flavor-vars.yml (100%) rename xci/{nfvi => installer}/osa/files/noha/inventory (100%) rename xci/{nfvi => installer}/osa/files/noha/openstack_user_config.yml (100%) rename xci/{nfvi => installer}/osa/files/noha/user_ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/noha/user_variables.yml (100%) rename xci/{nfvi => installer}/osa/files/noha/user_variables_ceph.yml (100%) rename xci/{nfvi => installer}/osa/files/openstack_services.yml (100%) rename xci/{nfvi => installer}/osa/files/setup-openstack.yml (100%) rename xci/{nfvi => installer}/osa/playbooks/bootstrap-scenarios.yml (100%) rename xci/{nfvi => installer}/osa/playbooks/configure-localhost.yml (100%) rename xci/{nfvi => installer}/osa/playbooks/configure-opnfvhost.yml (91%) rename xci/{nfvi => installer}/osa/playbooks/configure-targethosts.yml (100%) rename xci/{nfvi => installer}/osa/playbooks/inventory (100%) diff --git a/xci/config/env-vars b/xci/config/env-vars index b4a40165..c7744ca1 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 da3528f4..64f2882b 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 similarity index 100% rename from xci/nfvi/osa/nfvi-deploy.sh rename to 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 similarity index 100% rename from xci/nfvi/osa/files/aio/flavor-vars.yml rename to xci/installer/osa/files/aio/flavor-vars.yml diff --git a/xci/nfvi/osa/files/aio/inventory b/xci/installer/osa/files/aio/inventory similarity index 100% rename from xci/nfvi/osa/files/aio/inventory rename to 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 similarity index 100% rename from xci/nfvi/osa/files/ansible-role-requirements.yml rename to xci/installer/osa/files/ansible-role-requirements.yml diff --git a/xci/nfvi/osa/files/cinder.yml b/xci/installer/osa/files/cinder.yml similarity index 100% rename from xci/nfvi/osa/files/cinder.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/global-requirement-pins.txt rename to 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 similarity index 100% rename from xci/nfvi/osa/files/ha/ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/ha/flavor-vars.yml rename to xci/installer/osa/files/ha/flavor-vars.yml diff --git a/xci/nfvi/osa/files/ha/inventory b/xci/installer/osa/files/ha/inventory similarity index 100% rename from xci/nfvi/osa/files/ha/inventory rename to 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 similarity index 100% rename from xci/nfvi/osa/files/ha/openstack_user_config.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/ha/user_ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/ha/user_variables.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/ha/user_variables_ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/mini/ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/mini/flavor-vars.yml rename to xci/installer/osa/files/mini/flavor-vars.yml diff --git a/xci/nfvi/osa/files/mini/inventory b/xci/installer/osa/files/mini/inventory similarity index 100% rename from xci/nfvi/osa/files/mini/inventory rename to 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 similarity index 100% rename from xci/nfvi/osa/files/mini/openstack_user_config.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/mini/user_ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/mini/user_variables.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/mini/user_variables_ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/noha/ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/noha/flavor-vars.yml rename to xci/installer/osa/files/noha/flavor-vars.yml diff --git a/xci/nfvi/osa/files/noha/inventory b/xci/installer/osa/files/noha/inventory similarity index 100% rename from xci/nfvi/osa/files/noha/inventory rename to 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 similarity index 100% rename from xci/nfvi/osa/files/noha/openstack_user_config.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/noha/user_ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/noha/user_variables.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/noha/user_variables_ceph.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/openstack_services.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/files/setup-openstack.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/playbooks/bootstrap-scenarios.yml rename to 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 similarity index 100% rename from xci/nfvi/osa/playbooks/configure-localhost.yml rename to 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 similarity index 91% rename from xci/nfvi/osa/playbooks/configure-opnfvhost.yml rename to xci/installer/osa/playbooks/configure-opnfvhost.yml index 7f0e43f9..de922d3c 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 similarity index 100% rename from xci/nfvi/osa/playbooks/configure-targethosts.yml rename to xci/installer/osa/playbooks/configure-targethosts.yml diff --git a/xci/nfvi/osa/playbooks/inventory b/xci/installer/osa/playbooks/inventory similarity index 100% rename from xci/nfvi/osa/playbooks/inventory rename to xci/installer/osa/playbooks/inventory diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index a250974f..929d88eb 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 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 }}. - '' diff --git a/xci/scripts/update-osa-version-files.sh b/xci/scripts/update-osa-version-files.sh index 678ad03f..a8b0cefc 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 70c80da0..5638eba4 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 e0b31ab9..99053c7e 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: -- 2.16.6