summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--xci/installer/osa/files/ansible-role-requirements.yml2
-rw-r--r--xci/installer/osa/playbooks/bootstrap-scenarios.yml4
-rw-r--r--xci/opnfv-scenario-requirements.yml15
-rw-r--r--xci/var/opnfv.yml1
4 files changed, 21 insertions, 1 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/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