diff options
Diffstat (limited to 'xci')
| -rw-r--r-- | xci/files/xci-lib.sh | 2 | ||||
| -rw-r--r-- | xci/installer/osa/files/ansible-role-requirements.yml | 2 | ||||
| -rw-r--r-- | xci/installer/osa/files/setup-openstack.yml | 1 | ||||
| -rw-r--r-- | xci/installer/osa/playbooks/post-deployment.yml | 1 | ||||
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 14 |
5 files changed, 18 insertions, 2 deletions
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/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 diff --git a/xci/installer/osa/playbooks/post-deployment.yml b/xci/installer/osa/playbooks/post-deployment.yml index 9f2fec38..36c052c9 100644 --- a/xci/installer/osa/playbooks/post-deployment.yml +++ b/xci/installer/osa/playbooks/post-deployment.yml @@ -12,6 +12,7 @@ vars_files: - "{{ xci_path }}/xci/var/opnfv.yml" - "{{ xci_path }}/xci/installer/osa/files/openstack_services.yml" + - "{{ xci_path }}/xci/installer/osa/files/{{ xci_flavor }}/user_variables.yml" environment: http_proxy: "{{ lookup('env','http_proxy') }}" diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index f5fc62df..680ad32b 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -71,6 +71,20 @@ - opensuse - ubuntu +- scenario: os-odl-sfc_osm + scm: git + src: https://gerrit.opnfv.org/gerrit/sfc + version: master + role: scenarios/os-odl-sfc_osm/role/os-odl-sfc_osm + installers: + - installer: osa + flavors: + - ha + - mini + - noha + distros: + - ubuntu + - scenario: os-odl-bgpvpn scm: git src: https://gerrit.opnfv.org/gerrit/sdnvpn |