From b16ce9e22edc765378943072f4a303375fc24e99 Mon Sep 17 00:00:00 2001 From: Dan Radez Date: Tue, 4 Apr 2017 12:12:11 -0400 Subject: [PATCH] RPM version update / ovs_dpdk rename - updating RPM version numbers for Euphrates - renaming ovs scenario to ovs_dpdk JIRA: APEX-434 Change-Id: I75e1d96bd613ea04e2ffd12bd41b3a536ff75d7f Signed-off-by: Dan Radez --- build/rpm_specs/opnfv-apex-common.spec | 21 ++++++++++++--------- build/rpm_specs/opnfv-apex-onos.spec | 4 +++- build/rpm_specs/opnfv-apex-release.spec | 4 +++- build/rpm_specs/opnfv-apex-undercloud.spec | 4 +++- build/rpm_specs/opnfv-apex.spec | 4 +++- ...-nosdn-ovs-ha.yaml => os-nosdn-ovs_dpdk-ha.yaml} | 0 ...dn-ovs-noha.yaml => os-nosdn-ovs_dpdk-noha.yaml} | 0 .../{os-odl-ovs-ha.yaml => os-odl-ovs_dpdk-ha.yaml} | 0 ...-odl-ovs-noha.yaml => os-odl-ovs_dpdk-noha.yaml} | 0 docs/release/installation/architecture.rst | 8 ++++---- tests/test_apex_deploy_settings.py | 4 ++-- 11 files changed, 30 insertions(+), 19 deletions(-) rename config/deploy/{os-nosdn-ovs-ha.yaml => os-nosdn-ovs_dpdk-ha.yaml} (100%) rename config/deploy/{os-nosdn-ovs-noha.yaml => os-nosdn-ovs_dpdk-noha.yaml} (100%) rename config/deploy/{os-odl-ovs-ha.yaml => os-odl-ovs_dpdk-ha.yaml} (100%) rename config/deploy/{os-odl-ovs-noha.yaml => os-odl-ovs_dpdk-noha.yaml} (100%) diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec index d063ba67..ca7a05e5 100644 --- a/build/rpm_specs/opnfv-apex-common.spec +++ b/build/rpm_specs/opnfv-apex-common.spec @@ -1,5 +1,5 @@ Name: opnfv-apex-common -Version: 4.0 +Version: 5.0 Release: %{release} Summary: Scripts for OPNFV deployment using RDO Manager @@ -40,10 +40,10 @@ mkdir -p %{buildroot}%{_sysconfdir}/opnfv-apex/ install config/deploy/os-nosdn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml install config/deploy/os-nosdn-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml install config/deploy/os-nosdn-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml -install config/deploy/os-nosdn-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml +install config/deploy/os-nosdn-ovs_dpdk-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-noha.yaml install config/deploy/os-nosdn-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml install config/deploy/os-nosdn-performance-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml -install config/deploy/os-nosdn-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml +install config/deploy/os-nosdn-ovs_dpdk-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml install config/deploy/os-nosdn-kvm-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml install config/deploy/os-nosdn-kvm-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml install config/deploy/os-odl_l2-sfc-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml @@ -55,8 +55,8 @@ install config/deploy/os-odl-fdio-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-ape install config/deploy/os-odl-fdio-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml install config/deploy/os-odl-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml install config/deploy/os-odl-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml -install config/deploy/os-odl-ovs-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs-ha.yaml -install config/deploy/os-odl-ovs-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs-noha.yaml +install config/deploy/os-odl-ovs_dpdk-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-ha.yaml +install config/deploy/os-odl-ovs_dpdk-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml install config/deploy/os-odl-gluon-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml install config/deploy/os-ovn-nofeature-noha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-ovn-nofeature-noha.yaml #install config/deploy/os-onos-nofeature-ha.yaml %{buildroot}%{_sysconfdir}/opnfv-apex/os-onos-nofeature-ha.yaml @@ -125,10 +125,10 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-fdio-ha.yaml -%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-noha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-noha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-performance-ha.yaml -%{_sysconfdir}/opnfv-apex/os-nosdn-ovs-ha.yaml +%{_sysconfdir}/opnfv-apex/os-nosdn-ovs_dpdk-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-ha.yaml %{_sysconfdir}/opnfv-apex/os-nosdn-kvm-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl_l2-sfc-noha.yaml @@ -138,8 +138,8 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %{_sysconfdir}/opnfv-apex/os-odl_l2-fdio-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-fdio-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-fdio-ha.yaml -%{_sysconfdir}/opnfv-apex/os-odl-ovs-noha.yaml -%{_sysconfdir}/opnfv-apex/os-odl-ovs-ha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-noha.yaml +%{_sysconfdir}/opnfv-apex/os-odl-ovs_dpdk-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-nofeature-ha.yaml %{_sysconfdir}/opnfv-apex/os-odl-nofeature-noha.yaml %{_sysconfdir}/opnfv-apex/os-odl-gluon-noha.yaml @@ -161,6 +161,9 @@ install config/inventory/pod_example_settings.yaml %{buildroot}%{_docdir}/opnfv/ %doc %{_docdir}/opnfv/inventory.yaml.example %changelog +* Tue Apr 04 2017 Dan Radez - 5.0-1 +- Version update for Euphrates +- rename to ovs_dpdk * Wed Mar 29 2017 Dan Radez - 4.0-9 - Remove odl_l2-nofeature scenario file - rename all odl_l3 scenario files to odl diff --git a/build/rpm_specs/opnfv-apex-onos.spec b/build/rpm_specs/opnfv-apex-onos.spec index 7bdd7772..af18ccc2 100644 --- a/build/rpm_specs/opnfv-apex-onos.spec +++ b/build/rpm_specs/opnfv-apex-onos.spec @@ -1,5 +1,5 @@ Name: opnfv-apex-onos -Version: 4.0 +Version: 5.0 Release: %{release} Summary: Overcloud Disk images for OPNFV Apex ONOS deployment @@ -28,6 +28,8 @@ install build/overcloud-full-onos.qcow2 %{buildroot}%{_var}/opt/opnfv/images/ %{_var}/opt/opnfv/images/overcloud-full-onos.qcow2 %changelog +* Tue Apr 04 2017 Dan Radez - 5.0-1 +- Version update for Euphrates * Wed Dec 7 2016 Tim Rozet - 4.0-2 - Make install path consistent * Wed Nov 2 2016 Dan Radez - 4.0-1 diff --git a/build/rpm_specs/opnfv-apex-release.spec b/build/rpm_specs/opnfv-apex-release.spec index 7dd43d93..1be58a1c 100644 --- a/build/rpm_specs/opnfv-apex-release.spec +++ b/build/rpm_specs/opnfv-apex-release.spec @@ -1,5 +1,5 @@ Name: opnfv-apex-release -Version: danube +Version: euphrates Release: %{release} Summary: RPM Release file @@ -26,5 +26,7 @@ install config/yum.repos.d/opnfv-apex.repo %{buildroot}%{_sysconfdir}/yum.repos. %{_sysconfdir}/yum.repos.d/opnfv-apex.repo %changelog +* Tue Apr 04 2017 Dan Radez - 5.0-1 +- Version update for Euphrates * Wed Nov 23 2016 Dan Radez - 3.0-1 - Initial Packaging diff --git a/build/rpm_specs/opnfv-apex-undercloud.spec b/build/rpm_specs/opnfv-apex-undercloud.spec index 54b8acc1..55a614d0 100644 --- a/build/rpm_specs/opnfv-apex-undercloud.spec +++ b/build/rpm_specs/opnfv-apex-undercloud.spec @@ -1,5 +1,5 @@ Name: opnfv-apex-undercloud -Version: 4.0 +Version: 5.0 Release: %{release} Summary: Scripts and Disk images to launch the Undercloud for OPNFV Apex @@ -35,6 +35,8 @@ install build/nics-template.yaml.jinja2 %{buildroot}%{_var}/opt/opnfv/ %changelog +* Tue Apr 04 2017 Dan Radez - 5.0-1 +- Version update for Euphrates * Wed Nov 2 2016 Dan Radez - 4.0-1 - Version update for Danube * Tue May 24 2016 Tim Rozet - 3.0-1 diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec index a74733c5..450044c0 100644 --- a/build/rpm_specs/opnfv-apex.spec +++ b/build/rpm_specs/opnfv-apex.spec @@ -1,5 +1,5 @@ Name: opnfv-apex -Version: 4.0 +Version: 5.0 Release: %{release} Summary: Overcloud Disk images for OPNFV Apex OpenDaylight deployment @@ -28,6 +28,8 @@ install build/overcloud-full-opendaylight.qcow2 %{buildroot}%{_var}/opt/opnfv/im %{_var}/opt/opnfv/images/overcloud-full-opendaylight.qcow2 %changelog +* Tue Apr 04 2017 Dan Radez - 5.0-1 +- Version update for Euphrates * Wed Dec 7 2016 Tim Rozet - 4.0-2 - Make install path consistent * Wed Nov 2 2016 Dan Radez - 4.0-1 diff --git a/config/deploy/os-nosdn-ovs-ha.yaml b/config/deploy/os-nosdn-ovs_dpdk-ha.yaml similarity index 100% rename from config/deploy/os-nosdn-ovs-ha.yaml rename to config/deploy/os-nosdn-ovs_dpdk-ha.yaml diff --git a/config/deploy/os-nosdn-ovs-noha.yaml b/config/deploy/os-nosdn-ovs_dpdk-noha.yaml similarity index 100% rename from config/deploy/os-nosdn-ovs-noha.yaml rename to config/deploy/os-nosdn-ovs_dpdk-noha.yaml diff --git a/config/deploy/os-odl-ovs-ha.yaml b/config/deploy/os-odl-ovs_dpdk-ha.yaml similarity index 100% rename from config/deploy/os-odl-ovs-ha.yaml rename to config/deploy/os-odl-ovs_dpdk-ha.yaml diff --git a/config/deploy/os-odl-ovs-noha.yaml b/config/deploy/os-odl-ovs_dpdk-noha.yaml similarity index 100% rename from config/deploy/os-odl-ovs-noha.yaml rename to config/deploy/os-odl-ovs_dpdk-noha.yaml diff --git a/docs/release/installation/architecture.rst b/docs/release/installation/architecture.rst index eff5d35d..232e72b5 100644 --- a/docs/release/installation/architecture.rst +++ b/docs/release/installation/architecture.rst @@ -127,9 +127,9 @@ issues per scenario. The following scenarios correspond to a supported +-------------------------+-------------+---------------+ | os-nosdn-nofeature-noha | Apex | Yes | +-------------------------+-------------+---------------+ -| os-nosdn-ovs-ha | OVS for NFV | Yes | +| os-nosdn-ovs_dpdk-ha | OVS for NFV | Yes | +-------------------------+-------------+---------------+ -| os-nosdn-ovs-noha | OVS for NFV | Yes | +| os-nosdn-ovs_dpdk-noha | OVS for NFV | Yes | +-------------------------+-------------+---------------+ | os-nosdn-fdio-ha | FDS | No | +-------------------------+-------------+---------------+ @@ -145,9 +145,9 @@ issues per scenario. The following scenarios correspond to a supported +-------------------------+-------------+---------------+ | os-odl_l3-nofeature-noha| Apex | Yes | +-------------------------+-------------+---------------+ -| os-odl_l3-ovs-ha | OVS for NFV | Yes | +| os-odl_l3-ovs_dpdk-ha | OVS for NFV | Yes | +-------------------------+-------------+---------------+ -| os-odl_l3-ovs-noha | OVS for NFV | Yes | +| os-odl_l3-ovs_dpdk-noha | OVS for NFV | Yes | +-------------------------+-------------+---------------+ | os-odl-bgpvpn-ha | SDNVPN | Yes | +-------------------------+-------------+---------------+ diff --git a/tests/test_apex_deploy_settings.py b/tests/test_apex_deploy_settings.py index 5765c1ca..5882eb95 100644 --- a/tests/test_apex_deploy_settings.py +++ b/tests/test_apex_deploy_settings.py @@ -20,13 +20,13 @@ from nose.tools import assert_is_instance deploy_files = ('deploy_settings.yaml', 'os-nosdn-nofeature-noha.yaml', - 'os-nosdn-ovs-noha.yaml', + 'os-nosdn-ovs_dpdk-noha.yaml', 'os-ocl-nofeature-ha.yaml', 'os-odl-bgpvpn-ha.yaml', 'os-odl-bgpvpn-noha.yaml', 'os-odl-nofeature-ha.yaml', 'os-nosdn-nofeature-ha.yaml', - 'os-nosdn-ovs-ha.yaml', + 'os-nosdn-ovs_dpdk-ha.yaml', 'os-nosdn-performance-ha.yaml', 'os-odl-nofeature-ha.yaml', 'os-odl_l2-sfc-noha.yaml', -- 2.16.6