From db04bf3514fb38130df938fa4ab764c07a9992ba Mon Sep 17 00:00:00 2001
From: Thomas Goirand <zigo@debian.org>
Date: Mon, 28 Dec 2015 15:57:46 +0100
Subject: [PATCH] Fixes OVS agent pkg and service name

Since a few OpenStack release, the package
neutron-plugin-openvswitch-agent has been renamed
neutron-openvswitch-agent in Debian, as it doesn't realy make
sense to keep the "plugin" part. This patch fixes it at the
puppet level.

Change-Id: I942a865b330c6278a1e33534e94ed13b0ab9d76e
Closes-Bug: #1529525
---
 manifests/params.pp                         | 12 ++++++++++--
 spec/classes/neutron_agents_ml2_ovs_spec.rb | 19 ++++++++++++++++++-
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/manifests/params.pp b/manifests/params.pp
index 7f7f9a146..260c16410 100644
--- a/manifests/params.pp
+++ b/manifests/params.pp
@@ -95,8 +95,16 @@ class neutron::params {
       $ml2_server_package = false
     }
 
-    $ovs_agent_package   = 'neutron-plugin-openvswitch-agent'
-    $ovs_agent_service   = 'neutron-plugin-openvswitch-agent'
+    case $::os_package_type {
+      'debian': {
+        $ovs_agent_package   = 'neutron-openvswitch-agent'
+        $ovs_agent_service   = 'neutron-openvswitch-agent'
+      }
+      default: {
+        $ovs_agent_package   = 'neutron-plugin-openvswitch-agent'
+        $ovs_agent_service   = 'neutron-plugin-openvswitch-agent'
+      }
+    }
     $ovs_server_package  = 'neutron-plugin-openvswitch'
     $ovs_cleanup_service = false
     $ovs_package         = 'openvswitch-switch'
diff --git a/spec/classes/neutron_agents_ml2_ovs_spec.rb b/spec/classes/neutron_agents_ml2_ovs_spec.rb
index 64c1c0d49..06bd6eca6 100644
--- a/spec/classes/neutron_agents_ml2_ovs_spec.rb
+++ b/spec/classes/neutron_agents_ml2_ovs_spec.rb
@@ -244,7 +244,24 @@ describe 'neutron::agents::ml2::ovs' do
   context 'on Debian platforms' do
     let :facts do
       @default_facts.merge(test_facts.merge({
-         :osfamily => 'Debian'
+         :osfamily => 'Debian',
+         :os_package_type => 'debian'
+      }))
+    end
+
+    let :platform_params do
+      { :ovs_agent_package => 'neutron-openvswitch-agent',
+        :ovs_agent_service => 'neutron-openvswitch-agent' }
+    end
+
+    it_configures 'neutron plugin ovs agent with ml2 plugin'
+  end
+
+  context 'on Ubuntu platforms' do
+    let :facts do
+      @default_facts.merge(test_facts.merge({
+         :osfamily => 'Debian',
+         :os_package_type => 'ubuntu'
       }))
     end