Changes for Rocky cycle deprecations

* ironic::conductor::inspect_timeout now sets inspect_wait_timeout
* ironic::drivers::inspector::enabled is now deprecated (noop)

Change-Id: If14d1212f7eda0cc44b7802e0788b65de63d7666

manifests/conductor.pp

@@ -263,7 +263,7 @@ class ironic::conductor (
     'deploy/continue_if_disk_secure_erase_fails': value => $continue_if_disk_secure_erase_fails;
     'conductor/configdrive_use_swift':            value => $configdrive_use_swift;
     'conductor/configdrive_swift_container':      value => $configdrive_swift_container;
-    'conductor/inspect_timeout':                  value => $inspect_timeout;
+    'conductor/inspect_wait_timeout':             value => $inspect_timeout;
     'deploy/default_boot_option':                 value => $default_boot_option;
     'neutron/port_setup_delay':                   value => $port_setup_delay;
     'conductor/power_state_change_timeout':       value => $power_state_change_timeout;

manifests/drivers/inspector.pp

@@ -14,11 +14,6 @@
 #
 # Configure how Ironic talks to Ironic Inspector.
 #
-# [*enabled*]
-#   Whether or not to enable ironic-inspector support for inspection.
-#   This option does not affect new-style dynamic drivers and fake_inspector.
-#   Defaults to $::os_service_default
-#
 # [*service_url*]
 #   Ironic Inspector API endpoint. If not provided, the service catalog
 #   is used instead.
@@ -52,8 +47,14 @@
 #   The name of project's domain (required for Identity V3).
 #   Defaults to 'Default'
 #
+# DEPRECATED PARAMETERS
+#
+# [*enabled*]
+#   Whether or not to enable ironic-inspector support for inspection.
+#   This option does not affect new-style dynamic drivers and fake_inspector.
+#   Defaults to $::os_service_default
+#
 class ironic::drivers::inspector (
-  $enabled             = $::os_service_default,
   $service_url         = $::os_service_default,
   $auth_type           = 'password',
   $auth_url            = $::os_service_default,
@@ -62,12 +63,18 @@ class ironic::drivers::inspector (
   $password            = $::os_service_default,
   $user_domain_name    = 'Default',
   $project_domain_name = 'Default',
+  # DEPRECATED PARAMETERS
+  $enabled             = undef,
 ) {
 
   include ::ironic::deps
 
+  if $enabled {
+    warning("The ironic::drivers::inspector::enabled parameter is deprecated. \
+Please use ironic::drivers::hardware_interfaces::enabled_inspect_interfaces instead.")
+  }
+
   ironic_config {
-    'inspector/enabled':             value => $enabled;
     'inspector/service_url':         value => $service_url;
     'inspector/auth_type':           value => $auth_type;
     'inspector/username':            value => $username;

releasenotes/notes/inspector-enabled-f0eedadbf4d6c3c1.yaml

@@ -0,0 +1,7 @@
+---
+deprecations:
+  - |
+    The ``ironic::drivers::inspector::enabled`` parameter is now deprecated and
+    has no effect. This option does not work with hardware types, and classic
+    drivers have been removed. Use the ``enabled_inspect_interfaces`` parameter
+    from ``ironic::drivers::hardware_interfaces`` instead.

spec/classes/ironic_conductor_spec.rb

@@ -76,7 +76,7 @@ describe 'ironic::conductor' do
       is_expected.to contain_ironic_config('deploy/http_root').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('conductor/configdrive_use_swift').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('conductor/configdrive_swift_container').with(:value => '<SERVICE DEFAULT>')
-      is_expected.to contain_ironic_config('conductor/inspect_timeout').with(:value => '<SERVICE DEFAULT>')
+      is_expected.to contain_ironic_config('conductor/inspect_wait_timeout').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('deploy/default_boot_option').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('neutron/port_setup_delay').with(:value => '<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('conductor/power_state_change_timeout').with(:value => '<SERVICE DEFAULT>')
@@ -101,6 +101,7 @@ describe 'ironic::conductor' do
           :http_root                       => '/src/www',
           :configdrive_use_swift           => true,
           :configdrive_swift_container     => 'cont',
+          :inspect_timeout                 => 600,
           :default_boot_option             => 'local',
           :port_setup_delay                => '15',
           :power_state_change_timeout      => '300',
@@ -124,6 +125,7 @@ describe 'ironic::conductor' do
         is_expected.to contain_ironic_config('deploy/http_root').with_value(p[:http_root])
         is_expected.to contain_ironic_config('conductor/configdrive_use_swift').with_value(p[:configdrive_use_swift])
         is_expected.to contain_ironic_config('conductor/configdrive_swift_container').with_value(p[:configdrive_swift_container])
+        is_expected.to contain_ironic_config('conductor/inspect_wait_timeout').with_value(p[:inspect_timeout])
         is_expected.to contain_ironic_config('deploy/default_boot_option').with_value(p[:default_boot_option])
         is_expected.to contain_ironic_config('neutron/port_setup_delay').with_value(p[:port_setup_delay])
         is_expected.to contain_ironic_config('conductor/power_state_change_timeout').with_value(p[:power_state_change_timeout])

spec/classes/ironic_drivers_inspector_spec.rb

@@ -34,7 +34,6 @@ describe 'ironic::drivers::inspector' do
     end
 
     it 'configures ironic.conf' do
-      is_expected.to contain_ironic_config('inspector/enabled').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('inspector/service_url').with_value('<SERVICE DEFAULT>')
       is_expected.to contain_ironic_config('inspector/auth_type').with_value(p[:auth_type])
       is_expected.to contain_ironic_config('inspector/auth_url').with_value('<SERVICE DEFAULT>')
@@ -48,7 +47,6 @@ describe 'ironic::drivers::inspector' do
     context 'when overriding parameters' do
       before :each do
         params.merge!(
-            :enabled             => true,
             :service_url         => 'http://example.com/inspector',
             :auth_type           => 'noauth',
             :auth_url            => 'http://example.com',
@@ -61,7 +59,6 @@ describe 'ironic::drivers::inspector' do
       end
 
       it 'should replace default parameter with new value' do
-        is_expected.to contain_ironic_config('inspector/enabled').with_value(p[:enabled])
         is_expected.to contain_ironic_config('inspector/service_url').with_value(p[:service_url])
         is_expected.to contain_ironic_config('inspector/auth_type').with_value(p[:auth_type])
         is_expected.to contain_ironic_config('inspector/auth_url').with_value(p[:auth_url])