Merge "Debian/Ubuntu: Do not use the ironic-inspector-dnsmasq service" into stable/wallaby

manifests/inspector.pp

@@ -481,13 +481,17 @@ Use ironic::inspector::ironic::endpoint_override instead.')
   }
   Keystone_endpoint<||> -> Service['ironic-inspector']
 
-  service { 'ironic-inspector-dnsmasq':
-    ensure    => $ensure,
-    name      => $::ironic::params::inspector_dnsmasq_service,
-    enable    => $enabled,
-    hasstatus => true,
-    tag       => 'ironic-inspector-dnsmasq-service',
-    subscribe => File['/etc/ironic-inspector/dnsmasq.conf'],
+  if $::ironic::params::inspector_dnsmasq_service {
+    service { 'ironic-inspector-dnsmasq':
+      ensure    => $ensure,
+      name      => $::ironic::params::inspector_dnsmasq_service,
+      enable    => $enabled,
+      hasstatus => true,
+      tag       => 'ironic-inspector-dnsmasq-service',
+      subscribe => File['/etc/ironic-inspector/dnsmasq.conf'],
+    }
+  } else {
+    warning('The ironic-inspector-dnsmasq service is not available. \
+Please set up the dnsmasq service additionally.')
   }
-
 }

manifests/params.pp

@@ -78,10 +78,7 @@ class ironic::params {
       $inspector_package         = 'ironic-inspector'
       $inspector_dnsmasq_package = false
       $inspector_service         = 'ironic-inspector'
-      # it seems like there is not currently a builtin dnsmasq in the debian packaging
-      # https://packages.debian.org/source/experimental/ironic-inspector
-      # this should be changed to whatever debian will use for dnsmasq
-      $inspector_dnsmasq_service = 'ironic-inspector-dnsmasq'
+      $inspector_dnsmasq_service = false
       # guessing the name, ironic-staging-drivers is not packaged in debian yet
       $staging_drivers_package   = 'ironic-staging-drivers'
       $systemd_python_package    = 'python-systemd'

spec/classes/ironic_inspector_spec.rb

@@ -111,10 +111,12 @@ describe 'ironic::inspector' do
     end
 
     it 'ensure ironic inspector dnsmasq service is running' do
-      is_expected.to contain_service('ironic-inspector-dnsmasq').with(
-        'hasstatus' => true,
-        'tag'       => 'ironic-inspector-dnsmasq-service',
-      )
+      if platform_params.has_key?(:inspector_dnsmasq_package)
+        is_expected.to contain_service('ironic-inspector-dnsmasq').with(
+          'hasstatus' => true,
+          'tag'       => 'ironic-inspector-dnsmasq-service',
+        )
+      end
     end
 
     it 'configures inspector.conf' do