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.
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
- 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:
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"
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
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
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
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
- 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
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 }}.
- ''
# 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}@" \
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
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 ""
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:
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 "-------------------------------------------------------------------------"
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
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"
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:
Code Review / releng-xci.git / commitdiff