diff options
| author |   Tim Rozet <trozet@redhat.com> | 2016-04-08 16:46:14 -0400 |
|---|---|---|
| committer | Tim Rozet <trozet@redhat.com> | 2016-04-08 16:52:26 -0400 |
| commit | a3f26b861d42cb4bccb5c5f925122805e01ec36c (patch) | |
| tree | f019f2a786e1e827424ac50c461c99e15c06a970 | |
| parent | d76025948823d5d0dc38a6df81f5766f1e357a41 (diff) | |
Fixes vpn scenario to proper naming convention
Changes:
- Renames the sdnvpn scenario to be bgpvpn.
- Includes vpn deploy settings file into build
Change-Id: I0c21bed3debf28249d7ce3f24f108f690711ca93
Signed-off-by: Tim Rozet <trozet@redhat.com>
| -rw-r--r-- | build/opnfv-apex-common.spec | 2 | ||||
| -rw-r--r-- | config/deploy/os-odl_l2-bgpvpn-ha.yaml (renamed from config/deploy/os-odl_l2-sdnvpn-ha.yaml) | 0 |
2 files changed, 2 insertions, 0 deletions
diff --git a/build/opnfv-apex-common.spec b/build/opnfv-apex-common.spec index 16d5f2d7..e1675054 100644 --- a/build/opnfv-apex-common.spec +++ b/build/opnfv-apex-common.spec @@ -31,6 +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-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-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 @@ -60,6 +61,7 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-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_l3-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-opencontrail-nofeature-ha.yaml diff --git a/config/deploy/os-odl_l2-sdnvpn-ha.yaml b/config/deploy/os-odl_l2-bgpvpn-ha.yaml index 73507772..73507772 100644 --- a/config/deploy/os-odl_l2-sdnvpn-ha.yaml +++ b/config/deploy/os-odl_l2-bgpvpn-ha.yaml |