diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-01-29 01:17:24 -0500 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-01-30 22:44:21 +0000 |
| commit | 84dd01fb0af3ca0e63e2b169debbb7caaf4f8b1d (patch) | |
| tree | dc60b9ea77f9b4599c70fbbf17019a3ef8e999b8 /build/opnfv-apex-common.spec | |
| parent | 176cb1c73622c103831eae36f59d0497e4e0081c (diff) | |
Changes to make SFC deployments functional
Fixes include:
- sfc deployments now are non-HA, and disable swift and ringbuilder as
it causes issues with the 3.13 kernel
- ODL Features boot is now parameterized in heat templates
- SFC features boot is now set to "odl-ovsdb-sfc-rest"
- Coexistence table offsets included if SFC deployment
- VXLAN workaround applied for 123.123.123.x subnet if SFC
Change-Id: Ide5e0b451adcb98c417e57628a51302f3123647f
Signed-off-by: Tim Rozet <trozet@redhat.com>
(cherry picked from commit 13984a4de5090f961b2cf2c1923ffa72f1488343)
Diffstat (limited to 'build/opnfv-apex-common.spec')
| -rw-r--r-- | build/opnfv-apex-common.spec | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 752ce2e0..e0fd475a 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -31,7 +31,7 @@ install ci/clean.sh %{buildroot}%{_bindir}/opnfv-clean mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/ install config/deploy/os-nosdn-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-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-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-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_l3-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml install config/deploy/os-opencontrail-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml @@ -59,7 +59,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_var}/opt/opnfv/lib/installer/onos/onos_gw_mac_update.sh %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-nofeature-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l3-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml |