diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-07-19 16:28:43 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-07-20 14:17:34 -0400 |
| commit | 629fe0fd1eb566636db6dd15b87490844f429597 (patch) | |
| tree | 5de3eed2ff01aa7829ca1e553d163ff9cac26b8b /build | |
| parent | 40925d0cdc63e557ef04569642875cd07b8ed7ce (diff) | |
Fixes bgpvpn scenario
We had a regression where we missed adding bgpvpn code back into master.
opnfv-tht-pr: 45
JIRA: APEX-200
Change-Id: I44da1d653e13c48f276ad29daac1eb6f4f2d629b
Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'build')
| -rw-r--r-- | build/opnfv-apex-common.spec | 2 | ||||
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 4 |
2 files changed, 6 insertions, 0 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 5e1a9b36..854fbbb6 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -41,6 +41,7 @@ install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/op install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml install config/deploy/os-odl_l2-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml +install config/deploy/os-odl_l2-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml install config/deploy/os-odl_l2-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml install config/deploy/os-odl_l2-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml install config/deploy/os-odl_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml @@ -109,6 +110,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 4f8a3ff0..3e403bbc 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -36,6 +36,9 @@ enabled=1 gpgcheck=0 EOF +# SDNVPN - Copy tunnel setup script +wget https://raw.githubusercontent.com/openstack/fuel-plugin-opendaylight/brahmaputra-sr2/deployment_scripts/puppet/modules/opendaylight/templates/setup_TEPs.py + # install ODL packages # install Jolokia for ODL HA # Patch in OPNFV custom puppet-tripleO @@ -47,6 +50,7 @@ LIBGUESTFS_BACKEND=direct virt-customize \ --install https://github.com/michaeltchapman/networking_rpm/raw/master/openstack-neutron-bgpvpn-2015.2-1.el7.centos.noarch.rpm \ --run-command "wget https://github.com/rhuss/jolokia/releases/download/v1.3.3/jolokia-1.3.3-bin.tar.gz -O /tmp/jolokia-1.3.3-bin.tar.gz" \ --run-command "tar -xvf /tmp/jolokia-1.3.3-bin.tar.gz -C /opt/opendaylight/system/org" \ + --upload ./setup_TEPs.py:/tmp \ -a overcloud-full-opendaylight_build.qcow2 # Move these two lines above the -a overcloud-full-opendaylight_build.qcow2 when the patch has been rebased |