Merge "Manage octavia-driver-agent package/service"

manifests/driver_agent.pp

@@ -2,6 +2,18 @@
 #
 # == Parameters
 #
+# [*manage_service*]
+#   (optional) Whether the service should be managed by Puppet.
+#   Defaults to true.
+#
+# [*enabled*]
+#   (optional) Should the service be enabled.
+#   Defaults to true
+#
+# [*package_ensure*]
+#   (optional) ensure state for package.
+#   Defaults to 'present'
+#
 # [*status_socket_path*]
 #   (optional) Path to the driver status unix domain socket file.
 #   Defaults to $::os_service_default
@@ -57,6 +69,9 @@
 #   Defaults to $::os_service_default
 #
 class octavia::driver_agent (
+  $manage_service                  = true,
+  $enabled                         = true,
+  $package_ensure                  = 'present',
   $status_socket_path              = $::os_service_default,
   $stats_socket_path               = $::os_service_default,
   $get_socket_path                 = $::os_service_default,
@@ -69,11 +84,37 @@ class octavia::driver_agent (
   $max_process_warning_percent     = $::os_service_default,
   $provider_agent_shutdown_timeout = $::os_service_default,
   $enabled_provider_agents         = $::os_service_default,
-) inherits octavia::params {
+) {
 
   include octavia::deps
+  include octavia::params
 
-  # Octavia packaging does not currently provide a separate agent service or package.
+  if $::octavia::params::driver_agent_package_name {
+    package { 'octavia-driver-agent':
+      ensure => $package_ensure,
+      name   => $::octavia::params::driver_agent_package_name,
+      tag    => ['openstack', 'octavia-package'],
+    }
+  }
+
+  if $::octavia::params::driver_agent_service_name {
+    if $manage_service {
+      if $enabled {
+        $service_ensure = 'running'
+      } else {
+        $service_ensure = 'stopped'
+      }
+
+      service { 'octavia-driver-agent':
+        ensure     => $service_ensure,
+        name       => $::octavia::params::driver_agent_service_name,
+        enable     => $enabled,
+        hasstatus  => true,
+        hasrestart => true,
+        tag        => ['octavia-service']
+      }
+    }
+  }
 
   octavia_config {
     'driver_agent/status_socket_path':              value => $status_socket_path;

manifests/params.pp

@@ -17,8 +17,10 @@ class octavia::params {
       $worker_package_name         = 'openstack-octavia-worker'
       $health_manager_package_name = 'openstack-octavia-health-manager'
       $housekeeping_package_name   = 'openstack-octavia-housekeeping'
+      $driver_agent_package_name   = false
       $octavia_wsgi_script_path    = '/var/www/cgi-bin/octavia'
       $octavia_wsgi_script_source  = '/usr/bin/octavia-wsgi'
+      $driver_agent_service_name   = false
     }
     'Debian': {
       $common_package_name         = 'octavia-common'
@@ -26,8 +28,10 @@ class octavia::params {
       $worker_package_name         = 'octavia-worker'
       $health_manager_package_name = 'octavia-health-manager'
       $housekeeping_package_name   = 'octavia-housekeeping'
+      $driver_agent_package_name   = 'octavia-driver-agent'
       $octavia_wsgi_script_path    = '/usr/lib/cgi-bin/octavia'
       $octavia_wsgi_script_source  = '/usr/bin/octavia-wsgi'
+      $driver_agent_service_name   = 'octavia-driver-agent'
     }
     default: {
       fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, \

releasenotes/notes/octavia-driver-agent-8b61e27e91e49b59.yaml

@@ -0,0 +1,5 @@
+---
+features:
+  - |
+    Now the ``octavia::driver_agent`` class can manage the package and
+    the service required to run the octavia-driver-agent service.

spec/classes/octavia_driver_agent_spec.rb

@@ -3,8 +3,7 @@ require 'spec_helper'
 describe 'octavia::driver_agent' do
 
   let :params do
-    {
-    }
+    {}
   end
 
   shared_examples_for 'octavia-driver-agent' do
@@ -57,6 +56,24 @@ describe 'octavia::driver_agent' do
     end
   end
 
+  shared_examples_for 'octavia-driver-agent on Debian' do
+    context 'with default parameters' do
+      it { is_expected.to contain_package('octavia-driver-agent').with(
+        :ensure => 'present',
+        :name   => 'octavia-driver-agent',
+        :tag    => ['openstack', 'octavia-package'],
+      ) }
+
+      it { is_expected.to contain_service('octavia-driver-agent').with(
+        :ensure     => 'running',
+        :name       => 'octavia-driver-agent',
+        :enable     => true,
+        :hasstatus  => true,
+        :hasrestart => true,
+        :tag        => ['octavia-service']
+      ) }
+    end
+  end
 
   on_supported_os({
     :supported_os => OSDefaults.get_supported_os
@@ -65,7 +82,11 @@ describe 'octavia::driver_agent' do
       let (:facts) do
         facts.merge!(OSDefaults.get_facts())
       end
+
       it_behaves_like 'octavia-driver-agent'
+      if facts[:osfamily] == 'Debian'
+        it_behaves_like 'octavia-driver-agent on Debian'
+      end
     end
   end