Add support for the tacker-conductor service

Change-Id: I5a6c295bb30141eed2949bdd198b91b7865e7f96

manifests/conductor.pp

@@ -0,0 +1,47 @@
+# = Class: tacker::conductor
+#
+# This class manages the Tacker conductor.
+#
+# [*enabled*]
+#   (Optional) Service enable state for tacker-conductor.
+#   Defaults to true.
+#
+# [*manage_service*]
+#   (Optional) Whether the service is managed by this puppet class.
+#   Defaults to true.
+#
+# [*package_ensure*]
+#   (Optional) Ensure state for package.
+#   Defaults to 'present'
+#
+class tacker::conductor(
+  $manage_service = true,
+  $enabled        = true,
+  $package_ensure = 'present',
+) {
+
+  include tacker::deps
+  include tacker::params
+
+  ensure_packages('tacker-server', {
+    ensure => $package_ensure,
+    name   => $::tacker::params::package_name,
+    tag    => ['openstack', 'tacker-package'],
+  })
+
+  if $manage_service {
+    if $enabled {
+      $service_ensure = 'running'
+    } else {
+      $service_ensure = 'stopped'
+    }
+
+    service { 'tacker-conductor':
+      ensure => $service_ensure,
+      name   => $::tacker::params::conductor_service_name,
+      enable => $enabled,
+      tag    => 'tacker-service'
+    }
+  }
+
+}

manifests/params.pp

@@ -8,12 +8,14 @@ class tacker::params {
 
   case $::osfamily {
     'RedHat': {
-      $package_name     = 'openstack-tacker'
-      $service_name     = 'openstack-tacker-server'
+      $package_name           = 'openstack-tacker'
+      $server_service_name    = 'openstack-tacker-server'
+      $conductor_service_name = 'openstack-tacker-conductor'
     }
     'Debian': {
-      $package_name     = 'tacker'
-      $service_name     = 'tacker'
+      $package_name           = 'tacker'
+      $server_service_name    = 'tacker'
+      $conductor_service_name = 'tacker-conductor'
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \

manifests/server.pp

@@ -43,11 +43,11 @@ class tacker::server(
     include tacker::keystone::authtoken
   }
 
-  package { 'tacker-server':
+  ensure_packages('tacker-server', {
     ensure => $package_ensure,
     name   => $::tacker::params::package_name,
     tag    => ['openstack', 'tacker-package'],
-  }
+  })
 
   tacker_config {
     'DEFAULT/bind_host' : value => $bind_host;
@@ -60,12 +60,10 @@ class tacker::server(
     } else {
       $service_ensure = 'stopped'
     }
-  }
 
-  if $manage_service {
     service { 'tacker-server':
       ensure => $service_ensure,
-      name   => $::tacker::params::service_name,
+      name   => $::tacker::params::server_service_name,
       enable => $enabled,
       tag    => 'tacker-service'
     }

releasenotes/notes/conductor-ff8d3b89b5a3c0bd.yaml

@@ -0,0 +1,4 @@
+---
+features:
+  - |
+    The new ``tacker::conductor`` class has been added.

spec/classes/tacker_conductor_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe 'tacker::conductor' do
+
+  let :pre_condition do
+    "class {'tacker': }"
+  end
+
+  let :params do
+    { :enabled        => true,
+      :manage_service => true,
+    }
+  end
+
+  shared_examples_for 'tacker::conductor' do
+
+    it { is_expected.to contain_class('tacker::deps') }
+    it { is_expected.to contain_class('tacker::params') }
+
+    [{:enabled => true}, {:enabled => false}].each do |param_hash|
+      context "when service should be #{param_hash[:enabled] ? 'enabled' : 'disabled'}" do
+        before do
+          params.merge!(param_hash)
+        end
+
+        it 'configures tacker-server service' do
+          is_expected.to contain_service('tacker-conductor').with(
+            :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
+            :name   => platform_params[:conductor_service_name],
+            :enable => params[:enabled],
+            :tag    => 'tacker-service',
+          )
+        end
+        it 'contains tacker' do
+          is_expected.to contain_package('tacker-server').with(
+             :ensure => 'present',
+             :name   => platform_params[:tacker_package]
+          )
+        end
+
+      end
+    end
+
+  end
+
+  on_supported_os({
+    :supported_os   => OSDefaults.get_supported_os
+  }).each do |os,facts|
+    context "on #{os}" do
+      let (:facts) do
+        facts.merge!(OSDefaults.get_facts())
+      end
+
+      let(:platform_params) do
+        case facts[:osfamily]
+        when 'Debian'
+          { :conductor_service_name => 'tacker-conductor',
+            :tacker_package         => 'tacker' }
+        when 'RedHat'
+          { :conductor_service_name => 'openstack-tacker-conductor',
+            :tacker_package         => 'openstack-tacker' }
+        end
+      end
+
+      it_configures 'tacker::conductor'
+    end
+  end
+end

spec/classes/tacker_server_spec.rb

@@ -6,7 +6,7 @@ describe 'tacker::server' do
     "class { 'tacker::keystone::authtoken':
        password =>'foo',
      }
-     class {'::tacker': }"
+     class {'tacker': }"
   end
 
   let :params do
@@ -37,7 +37,7 @@ describe 'tacker::server' do
         it 'configures tacker-server service' do
           is_expected.to contain_service('tacker-server').with(
             :ensure => (params[:manage_service] && params[:enabled]) ? 'running' : 'stopped',
-            :name   => platform_params[:tacker_service],
+            :name   => platform_params[:server_service_name],
             :enable => params[:enabled],
             :tag    => 'tacker-service',
           )
@@ -65,11 +65,11 @@ describe 'tacker::server' do
       let(:platform_params) do
         case facts[:osfamily]
         when 'Debian'
-          { :tacker_service => 'tacker',
-            :tacker_package => 'tacker' }
+          { :server_service_name => 'tacker',
+            :tacker_package      => 'tacker' }
         when 'RedHat'
-          { :tacker_service => 'openstack-tacker-server',
-            :tacker_package => 'openstack-tacker' }
+          { :server_service_name => 'openstack-tacker-server',
+            :tacker_package      => 'openstack-tacker' }
         end
       end