Merge "Drop remaining inspector job"

devstack/lib/ironic

@@ -1868,29 +1868,13 @@ function configure_ironic_api {
 function configure_client_for {
     local service_config_section
     service_config_section=$1
-    local use_system_scope="False"
     # keystoneauth auth plugin options
     iniset $IRONIC_CONF_FILE $service_config_section auth_type password
     iniset $IRONIC_CONF_FILE $service_config_section auth_url $KEYSTONE_SERVICE_URI
-
-    # NOTE(TheJulia): Below are services which we know, as of late 2021, which support
-    # explicit scope based ops *and* have knobs.
-
-    if [[ "$service_config_section" == "inspector" ]] && [[ "$IRONIC_INSPECTOR_ENFORCE_SCOPE" == "True" ]]; then
-        use_system_scope="True"
-    fi
-
-    if [[ "$use_system_scope" == "True" ]]; then
-        iniset $IRONIC_CONF_FILE $service_config_section system_scope all
-        iniset $IRONIC_CONF_FILE $service_config_section username admin
-        iniset $IRONIC_CONF_FILE $service_config_section password $ADMIN_PASSWORD
-
-    else
-        iniset $IRONIC_CONF_FILE $service_config_section username ironic
-        iniset $IRONIC_CONF_FILE $service_config_section password $SERVICE_PASSWORD
-        iniset $IRONIC_CONF_FILE $service_config_section project_name $SERVICE_PROJECT_NAME
-        iniset $IRONIC_CONF_FILE $service_config_section project_domain_id default
-    fi
+    iniset $IRONIC_CONF_FILE $service_config_section username ironic
+    iniset $IRONIC_CONF_FILE $service_config_section password $SERVICE_PASSWORD
+    iniset $IRONIC_CONF_FILE $service_config_section project_name $SERVICE_PROJECT_NAME
+    iniset $IRONIC_CONF_FILE $service_config_section project_domain_id default
     iniset $IRONIC_CONF_FILE $service_config_section user_domain_id default
     # keystoneauth session options
     iniset $IRONIC_CONF_FILE $service_config_section cafile $SSL_BUNDLE_FILE
@@ -1905,7 +1889,7 @@ function configure_ironic_conductor {
 
     # NOTE(pas-ha) service_catalog section is used to discover
     # ironic API endpoint from keystone catalog
-    local client_sections="neutron swift glance inspector cinder service_catalog nova"
+    local client_sections="neutron swift glance cinder service_catalog nova"
     for conf_section in $client_sections; do
         configure_client_for $conf_section
     done
@@ -2069,18 +2053,7 @@ function configure_ironic_conductor {
         iniset $IRONIC_CONF_FILE DEFAULT isolinux_bin "$isolinux"
     fi
 
-    configure_inspection
-}
-
-# configure_inspection() - Set up in-band inspection
-function configure_inspection {
-    local allow_unmanaged="$IRONIC_UNMANAGED_INSPECTION"
-    # Note: IRONIC_INSPECTOR_MANAGED_BOOT is defined in the ironic-inspector's devstack plugin
-    if [[ "$IRONIC_ENABLED_INSPECT_INTERFACES" =~ inspector ]] && [[ "${IRONIC_INSPECTOR_MANAGED_BOOT:-False}" != True ]]; then
-        allow_unmanaged=True
-    fi
-
-    if [[ "$allow_unmanaged" == False ]]; then
+    if [[ "$IRONIC_UNMANAGED_INSPECTION" == False ]]; then
         iniset "$IRONIC_CONF_FILE" inspector require_managed_boot True
     fi
 }
@@ -4421,7 +4394,6 @@ function ironic_configure_tempest {
 
     if [[ "$IRONIC_ENFORCE_SCOPE" == "True" ]]; then
         iniset $TEMPEST_CONFIG enforce_scope ironic True
-        iniset $TEMPEST_CONFIG enforce_scope ironic_inspector True
     fi
 }
 

zuul.d/ironic-jobs.yaml

@@ -521,30 +521,6 @@
         s-object: True
         s-proxy: True
 
-# NOTE(JayF) Ironic inspector is deprecated and pending removal.
-# TODO(JayF) Remove this job.
-- job:
-    name: ironic-inspector-tempest-uefi-redfish-vmedia
-    description: "Inspect and deploy ironic node over Redfish virtual media using UEFI"
-    parent: ironic-tempest-uefi-redfish-vmedia
-    required-projects:
-      - opendev.org/openstack/ironic-inspector
-    vars:
-      # NOTE(dtantsur): the inspector job includes booting an instance too.
-      # Excluding the abort tests since it hits "node locked" too often.
-      tempest_test_regex: test_baremetal_introspection
-      devstack_localrc:
-        IRONIC_INSPECTOR_MANAGED_BOOT: True
-        IRONIC_INSPECTOR_NODE_NOT_FOUND_HOOK: ''
-        IRONIC_AUTOMATED_CLEAN_ENABLED: False
-        IRONIC_VM_COUNT: 1
-      devstack_plugins:
-        ironic-inspector: https://opendev.org/openstack/ironic-inspector
-      devstack_services:
-        atop: True
-        ironic-inspector: True
-        ironic-inspector-dhcp: True
-
 # NOTE(rpittau): converted job but not running for now as there
 # could be an issue with the lookup in ironic-python-agent
 # NOTE(JayF): ironic-tempest-ipa-wholedisk-bios-agent_ipmitool-tinyipa

zuul.d/project.yaml

@@ -71,8 +71,6 @@
         # Non-voting jobs
         - ironic-inspector-tempest:
             voting: false
-        - ironic-inspector-tempest-uefi-redfish-vmedia:
-            voting: false
         - ironic-standalone-aarch64:
             voting: false
         - ironic-tempest-ipa-wholedisk-bios-ipmi-direct-dib: