diff options
| -rw-r--r-- | xci/installer/osa/files/ansible-role-requirements.yml | 2 | ||||
| -rw-r--r-- | xci/installer/osa/playbooks/bootstrap-scenarios.yml | 4 | ||||
| -rw-r--r-- | xci/opnfv-scenario-requirements.yml | 15 | ||||
| -rwxr-xr-x | xci/scripts/vm/start-new-vm.sh | 4 | ||||
| -rw-r--r-- | xci/var/opnfv.yml | 1 |
5 files changed, 23 insertions, 3 deletions
diff --git a/xci/installer/osa/files/ansible-role-requirements.yml b/xci/installer/osa/files/ansible-role-requirements.yml index a1f7bb79..201ec59a 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: 293bec299811ff32ce5a62fdd18429ab8bb88734 + version: ced7cb81e995e8c15e80464e0217798b788ee139 - name: os_nova scm: git src: https://git.openstack.org/openstack/openstack-ansible-os_nova diff --git a/xci/installer/osa/playbooks/bootstrap-scenarios.yml b/xci/installer/osa/playbooks/bootstrap-scenarios.yml index 98acf73b..975c85c1 100644 --- a/xci/installer/osa/playbooks/bootstrap-scenarios.yml +++ b/xci/installer/osa/playbooks/bootstrap-scenarios.yml @@ -21,3 +21,7 @@ include_role: name: "os-odl-sfc" when: DEPLOY_SCENARIO == 'os-odl-sfc' +- name: Prepare everything to run the os-odl-bgpvpn scenario + include_role: + name: "os-odl-bgpvpn" + when: DEPLOY_SCENARIO == 'os-odl-bgpvpn' diff --git a/xci/opnfv-scenario-requirements.yml b/xci/opnfv-scenario-requirements.yml index 36415d3f..29b5c775 100644 --- a/xci/opnfv-scenario-requirements.yml +++ b/xci/opnfv-scenario-requirements.yml @@ -72,3 +72,18 @@ distros: - ubuntu - centos + +- scenario: os-odl-bgpvpn + scm: git + src: https://gerrit.opnfv.org/gerrit/sdnvpn + version: master + role: scenarios/os-odl-bgpvpn/role/os-odl-bgpvpn + installers: + - installer: osa + flavors: + - ha + - mini + - noha + distros: + - ubuntu + - centos diff --git a/xci/scripts/vm/start-new-vm.sh b/xci/scripts/vm/start-new-vm.sh index 78d385bd..c4b40b96 100755 --- a/xci/scripts/vm/start-new-vm.sh +++ b/xci/scripts/vm/start-new-vm.sh @@ -31,8 +31,8 @@ grep -q -i ^Y$ /sys/module/kvm_intel/parameters/nested || { echo "Nested virtual destroy_vm_on_failures() { local exit_err=${xci_error:-130} if ! ${XCI_KEEP_CLEAN_VM_ON_FAILURES}; then - sudo virsh destroy ${VM_NAME}_xci_vm - sudo virsh undefine ${VM_NAME}_xci_vm + sudo virsh destroy ${VM_NAME}_xci_vm || true + sudo virsh undefine ${VM_NAME}_xci_vm || true fi exit $exit_err } diff --git a/xci/var/opnfv.yml b/xci/var/opnfv.yml index ae0f061c..4120a9d9 100644 --- a/xci/var/opnfv.yml +++ b/xci/var/opnfv.yml @@ -49,4 +49,5 @@ opnfv_required_packages: opnfv_required_pip: - python-openstackclient + - python-neutronclient - docker-py |