From 56b2aaa9310be1abd4b311ceac12e02e2b51f0d5 Mon Sep 17 00:00:00 2001
From: Saravanan KR <skramaja@redhat.com>
Date: Fri, 5 Aug 2016 11:54:07 +0530
Subject: [PATCH] Modify the OVS DPDK package name to openvswitch
For Red Hat family, the OVS with DPDK will be provided
in the same package as OVS, named as openvswitch. This
is applicable for OVS2.5 version onwards, targeted for
newton. As of now, Ubuntu is packaging DPDK separately.
After getting clarity on Ubuntu DPDK packaging, the
required changes will be done for Ubuntu also, if any.
Change-Id: I91feedd48949aac520c719ab589a1542462ff887
---
manifests/params.pp | 4 +++-
spec/classes/vswitch_dpdk_spec.rb | 2 +-
2 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/manifests/params.pp b/manifests/params.pp
index c0b774a4..847a1a5e 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -12,7 +12,9 @@ class vswitch::params {
case $::osfamily {
'Redhat': {
$ovs_package_name = 'openvswitch'
- $ovs_dpdk_package_name = 'openvswitch-dpdk'
+ # OVS2.5 in Red Hat family is unified package which will support plain
+ # OVS and also DPDK (if enabled at runtime).
+ $ovs_dpdk_package_name = 'openvswitch'
$ovs_dkms_package_name = undef
$ovs_service_name = 'openvswitch'
$provider = 'ovs_redhat'
diff --git a/spec/classes/vswitch_dpdk_spec.rb b/spec/classes/vswitch_dpdk_spec.rb
index 0f933f0f..7079a50a 100644
--- a/spec/classes/vswitch_dpdk_spec.rb
+++ b/spec/classes/vswitch_dpdk_spec.rb
@@ -10,7 +10,7 @@ describe 'vswitch::dpdk' do
end
let :redhat_platform_params do {
- :ovs_dpdk_package_name => 'openvswitch-dpdk',
+ :ovs_dpdk_package_name => 'openvswitch',
:ovs_service_name => 'openvswitch',
:provider => 'ovs_redhat',
}