diff options
| -rwxr-xr-x | xci/config/user-vars | 2 | ||||
| -rw-r--r-- | xci/files/xci-lib.sh | 2 | ||||
| -rw-r--r-- | xci/infra/bifrost/infra-provision.sh | 2 | ||||
| -rw-r--r-- | xci/infra/bifrost/playbooks/opnfv-virtual.yml | 3 | ||||
| -rw-r--r-- | xci/installer/osa/files/ansible-role-requirements.yml | 2 | ||||
| -rw-r--r-- | xci/installer/osa/files/setup-openstack.yml | 1 |
6 files changed, 6 insertions, 6 deletions
diff --git a/xci/config/user-vars b/xci/config/user-vars index 2625de24..951688af 100755 --- a/xci/config/user-vars +++ b/xci/config/user-vars @@ -53,6 +53,6 @@ export INFRA_DEPLOYMENT=${INFRA_DEPLOYMENT:-bifrost} export XCI_ANSIBLE_PARAMS=${XCI_ANSIBLE_PARAMS:-""} export RUN_TEMPEST=${RUN_TEMPEST:-false} export CORE_OPENSTACK_INSTALL=${CORE_OPENSTACK_INSTALL:-false} -export BIFROST_USE_PREBUILT_IMAGES=${BIFROST_USE_PREBUILT_IMAGES:-false} +export BIFROST_CREATE_IMAGE_VIA_DIB=${BIFROST_CREATE_IMAGE_VIA_DIB:-true} # Set this to to true to force XCI to re-create the target OS images export CLEAN_DIB_IMAGES=${CLEAN_DIB_IMAGES:-false} diff --git a/xci/files/xci-lib.sh b/xci/files/xci-lib.sh index cb0751da..ba730772 100644 --- a/xci/files/xci-lib.sh +++ b/xci/files/xci-lib.sh @@ -199,7 +199,7 @@ ansible_lint() { set -eu local playbooks_dir=(xci/playbooks xci/installer/osa/playbooks xci/installer/kubespray/playbooks) # Extract role from scenario information - local testing_role=$(sed -n "/^- scenario: ${DEPLOY_SCENARIO}/,/^$/p" ${XCI_PATH}/xci/opnfv-scenario-requirements.yml | grep role | rev | cut -d '/' -f -1 | rev) + local testing_role=$(sed -n "/^- scenario: ${DEPLOY_SCENARIO}$/,/^$/p" ${XCI_PATH}/xci/opnfv-scenario-requirements.yml | grep role | rev | cut -d '/' -f -1 | rev) # clear XCI_CACHE rm -rf ${XCI_CACHE}/repos/openstack-ansible-tests diff --git a/xci/infra/bifrost/infra-provision.sh b/xci/infra/bifrost/infra-provision.sh index e60e9de0..01019eae 100644 --- a/xci/infra/bifrost/infra-provision.sh +++ b/xci/infra/bifrost/infra-provision.sh @@ -71,7 +71,7 @@ ansible-playbook ${XCI_ANSIBLE_PARAMS} \ -e ironicclient_source_install=true \ -e ironicclient_git_branch=${BIFROST_IRONIC_CLIENT_VERSION:-master} \ -e ironic_git_branch=${BIFROST_IRONIC_VERSION:-master} \ - -e use_prebuilt_images=${BIFROST_USE_PREBUILT_IMAGES:-false} \ + -e create_image_via_dib=${BIFROST_CREATE_IMAGE_VIA_DIB:-true} \ -e xci_distro=${XCI_DISTRO} \ -e ironic_url="http://192.168.122.2:6385/" \ ${BIFROST_ROOT_DIR}/playbooks/opnfv-virtual.yml diff --git a/xci/infra/bifrost/playbooks/opnfv-virtual.yml b/xci/infra/bifrost/playbooks/opnfv-virtual.yml index 313919ba..77f4b512 100644 --- a/xci/infra/bifrost/playbooks/opnfv-virtual.yml +++ b/xci/infra/bifrost/playbooks/opnfv-virtual.yml @@ -52,7 +52,7 @@ mode: '0755' owner: 'root' group: 'root' - when: use_prebuilt_images | bool == true + when: create_image_via_dib | bool == false - name: Ensure /etc/hosts has good defaults lineinfile: create: yes @@ -101,7 +101,6 @@ when: - create_image_via_dib | bool == true - transform_boot_image | bool == false - - use_prebuilt_images | bool == false - role: bifrost-keystone-client-config clouds: bifrost: diff --git a/xci/installer/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml index ccd0542d..bbc92e08 100644 --- a/xci/installer/osa/files/ansible-role-requirements.yml +++ b/xci/installer/osa/files/ansible-role-requirements.yml @@ -116,7 +116,7 @@ - name: os_neutron scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_neutron - version: a8c7e0b506a0c347a363dde3f60077aa0cab5641 + version: 200fa4a7aaa15a6d6758418eafffe093174d2f72 - name: os_nova scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_nova diff --git a/xci/installer/osa/files/setup-openstack.yml b/xci/installer/osa/files/setup-openstack.yml index 8c20eed2..904215b7 100644 --- a/xci/installer/osa/files/setup-openstack.yml +++ b/xci/installer/osa/files/setup-openstack.yml @@ -25,6 +25,7 @@ - include: os-swift-install.yml - include: os-ironic-install.yml when: not core_openstack | default(False) +- include: os-barbican-install.yml - include: os-tacker-install.yml - include: os-tempest-install.yml when: (tempest_install | default(False)) | bool or (tempest_run | default(False)) | bool |