diff options
| -rw-r--r-- | build/rpm_specs/opnfv-apex-common.spec | 8 | ||||
| -rw-r--r-- | config/deploy/os-odl-bgpvpn-ha.yaml (renamed from config/deploy/os-odl_l2-bgpvpn-ha.yaml) | 3 | ||||
| -rw-r--r-- | config/deploy/os-odl-bgpvpn-noha.yaml (renamed from config/deploy/os-odl_l2-bgpvpn-noha.yaml) | 3 | ||||
| -rw-r--r-- | docs/installationprocedure/architecture.rst | 2 | ||||
| -rw-r--r-- | docs/installationprocedure/troubleshooting.rst | 2 | ||||
| -rw-r--r-- | docs/releasenotes/release-notes.rst | 2 | ||||
| -rw-r--r-- | tests/test_apex_deploy_settings.py | 4 |
7 files changed, 13 insertions, 11 deletions
diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index 09d54e07..077046f5 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -45,8 +45,8 @@ 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-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-bgpvpn-noha.yaml +install config/deploy/os-odl-bgpvpn-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml +install config/deploy/os-odl-bgpvpn-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.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 @@ -119,8 +119,8 @@ 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-bgpvpn-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-bgpvpn-noha.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/config/deploy/os-odl_l2-bgpvpn-ha.yaml b/config/deploy/os-odl-bgpvpn-ha.yaml index 1d29c2bf..ef51e737 100644 --- a/config/deploy/os-odl_l2-bgpvpn-ha.yaml +++ b/config/deploy/os-odl-bgpvpn-ha.yaml @@ -3,7 +3,8 @@ global_params: deploy_options: sdn_controller: opendaylight - sdn_l3: false + sdn_l3: true + odl_version: boron tacker: false congress: true sfc: false diff --git a/config/deploy/os-odl_l2-bgpvpn-noha.yaml b/config/deploy/os-odl-bgpvpn-noha.yaml index 011c2b3d..7812d054 100644 --- a/config/deploy/os-odl_l2-bgpvpn-noha.yaml +++ b/config/deploy/os-odl-bgpvpn-noha.yaml @@ -3,7 +3,8 @@ global_params: deploy_options: sdn_controller: opendaylight - sdn_l3: false + sdn_l3: true + odl_version: boron tacker: false congress: true sfc: false diff --git a/docs/installationprocedure/architecture.rst b/docs/installationprocedure/architecture.rst index 33536788..38806391 100644 --- a/docs/installationprocedure/architecture.rst +++ b/docs/installationprocedure/architecture.rst @@ -133,7 +133,7 @@ issues per scenario. The following scenarios correspond to a supported +-------------------------+------------+-----------------+ | os-odl_l2-sfc-noha | SFC | Yes | +-------------------------+------------+-----------------+ -| os-odl_l2-bgpvpn-ha | SDNVPN | No | +| os-odl-bgpvpn-ha | SDNVPN | No | +-------------------------+------------+-----------------+ | os-odl_l2-fdio-noha | FDS | Yes | +-------------------------+------------+-----------------+ diff --git a/docs/installationprocedure/troubleshooting.rst b/docs/installationprocedure/troubleshooting.rst index 56dfa5be..ed0d1ff6 100644 --- a/docs/installationprocedure/troubleshooting.rst +++ b/docs/installationprocedure/troubleshooting.rst @@ -87,7 +87,7 @@ OpenDaylight Integration When a user deploys any of the following scenarios: - - os-odl_l2-bgpvpn-ha.yaml + - os-odl-bgpvpn-ha.yaml - os-odl_l2-fdio-ha.yaml - os-odl_l2-fdio-noha.yaml - os-odl_l2-nofeature-ha.yaml diff --git a/docs/releasenotes/release-notes.rst b/docs/releasenotes/release-notes.rst index 3e6e0aac..a5d52f0c 100644 --- a/docs/releasenotes/release-notes.rst +++ b/docs/releasenotes/release-notes.rst @@ -300,7 +300,7 @@ Scenario os-odl_l2-nofeature known issues * `APEX-149 <https://jira.opnfv.org/browse/APEX-149>`_: Openflow rules are populated very slowly -Scenario os-odl_l2-bgpvpn known issues +Scenario os-odl-bgpvpn known issues -------------------------------------- * `APEX-278 <https://jira.opnfv.org/browse/APEX-278>`_: diff --git a/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py index a0af1211..48c55d79 100644 --- a/tests/test_apex_deploy_settings.py +++ b/tests/test_apex_deploy_settings.py @@ -22,8 +22,8 @@ deploy_files = ('deploy_settings.yaml', 'os-nosdn-nofeature-noha.yaml', 'os-nosdn-ovs-noha.yaml', 'os-ocl-nofeature-ha.yaml', - 'os-odl_l2-bgpvpn-ha.yaml', - 'os-odl_l2-bgpvpn-noha.yaml', + 'os-odl-bgpvpn-ha.yaml', + 'os-odl-bgpvpn-noha.yaml', 'os-odl_l3-nofeature-ha.yaml', 'os-nosdn-nofeature-ha.yaml', 'os-nosdn-ovs-ha.yaml', |