Merge "nosdn fdio scenario fixes"

diff --git a/build/c7-opnfv-x86_64-comps.xml b/build/c7-opnfv-x86_64-comps.xml
index 6387cfb..8bbe81d 100644 (file)
--- a/build/c7-opnfv-x86_64-comps.xml
+++ b/build/c7-opnfv-x86_64-comps.xml
@@ -5671,9 +5671,7 @@
       <packagereq type="default">openlmi-software</packagereq>
       <packagereq type="default">openlmi-storage</packagereq>
       <packagereq type="default">openslp-server</packagereq>
-      <packagereq type="default">openwsman-client</packagereq>
       <packagereq type="default">tog-pegasus</packagereq>
-      <packagereq type="default">wsmancli</packagereq>
       <packagereq type="optional">openlmi</packagereq>
       <packagereq type="optional">openlmi-account-doc</packagereq>
       <packagereq type="optional">openlmi-fan</packagereq>
@@ -5691,7 +5689,6 @@
       <packagereq type="optional">openlmi-storage-doc</packagereq>
       <packagereq type="optional">openlmi-tools</packagereq>
       <packagereq type="optional">openlmi-tools-doc</packagereq>
-      <packagereq type="optional">openwsman-server</packagereq>
       <packagereq type="optional">sblim-cim-client2</packagereq>
       <packagereq type="optional">sblim-cmpi-fsvol</packagereq>
       <packagereq type="optional">sblim-cmpi-network</packagereq>

diff --git a/build/rpm_specs/opnfv-apex-common.spec b/build/rpm_specs/opnfv-apex-common.spec
index d063ba6..ca7a05e 100644 (file)
--- 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 <dradez@redhat.com> - 5.0-1
+- Version update for Euphrates
+- rename to ovs_dpdk
 * Wed Mar 29 2017 Dan Radez <dradez@redhat.com> - 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 7bdd777..af18ccc 100644 (file)
--- 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 <dradez@redhat.com> - 5.0-1
+- Version update for Euphrates
 * Wed Dec 7 2016 Tim Rozet <trozet@redhat.com> - 4.0-2
 - Make install path consistent
 * Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1

diff --git a/build/rpm_specs/opnfv-apex-release.spec b/build/rpm_specs/opnfv-apex-release.spec
index 7dd43d9..1be58a1 100644 (file)
--- 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 <dradez@redhat.com> - 5.0-1
+- Version update for Euphrates
 * Wed Nov 23 2016 Dan Radez <dradez@redhat.com> - 3.0-1
 - Initial Packaging

diff --git a/build/rpm_specs/opnfv-apex-undercloud.spec b/build/rpm_specs/opnfv-apex-undercloud.spec
index 54b8acc..55a614d 100644 (file)
--- 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 <dradez@redhat.com> - 5.0-1
+- Version update for Euphrates
 * Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1
 - Version update for Danube
 * Tue May 24 2016 Tim Rozet <trozet@redhat.com> - 3.0-1

diff --git a/build/rpm_specs/opnfv-apex.spec b/build/rpm_specs/opnfv-apex.spec
index a74733c..450044c 100644 (file)
--- 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 <dradez@redhat.com> - 5.0-1
+- Version update for Euphrates
 * Wed Dec 7 2016 Tim Rozet <trozet@redhat.com> - 4.0-2
 - Make install path consistent
 * Wed Nov 2 2016 Dan Radez <dradez@redhat.com> - 4.0-1

diff --git a/build/undercloud.sh b/build/undercloud.sh
index de96f02..6d8937f 100755 (executable)
--- a/build/undercloud.sh
+++ b/build/undercloud.sh
@@ -29,7 +29,6 @@ sed "s/kvmfornfv_kernel.rpm/$kvmfornfv_kernel_rpm/" ${BUILD_ROOT}/enable_rt_kvm.
 
 # installing forked opnfv-tht
 # enabling ceph OSDs to live on the controller
-# OpenWSMan package update supports the AMT Ironic driver for the TealBox
 # seeding configuration files specific to OPNFV
 # add congress client
 # add congress password to python-tripleoclient
@@ -46,8 +45,6 @@ LIBGUESTFS_BACKEND=direct virt-customize \
     --run-command "cd /usr/share && rm -rf openstack-tripleo-heat-templates && tar xzf opnfv-tht.tar.gz" \
     --run-command "sed -i '/ControllerEnableCephStorage/c\\  ControllerEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \
     --run-command "sed -i '/ComputeEnableCephStorage/c\\  ComputeEnableCephStorage: true' /usr/share/openstack-tripleo-heat-templates/environments/storage-environment.yaml" \
-    --run-command "curl -f http://download.opensuse.org/repositories/Openwsman/CentOS_CentOS-7/Openwsman.repo > /etc/yum.repos.d/wsman.repo" \
-    --run-command "yum update -y openwsman*" \
     --run-command "cp /usr/share/instack-undercloud/undercloud.conf.sample /home/stack/undercloud.conf && chown stack:stack /home/stack/undercloud.conf" \
     --upload ${BUILD_ROOT}/opnfv-environment.yaml:/home/stack/ \
     --upload ${BUILD_ROOT}/first-boot.yaml:/home/stack/ \

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 eff5d35..232e72b 100644 (file)
--- 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 5765c1c..5882eb9 100644 (file)
--- 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',