From 13ecc294fa7d3ed6a2ae250df0069e5273c208a8 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: 2025年10月25日 01:30:14 +0900 Subject: [PATCH] Remove testing of ironic-inspector ... because the project was retired. Depends-on: https://review.opendev.org/963460 Change-Id: I6a4a6af2e39b87283fe1d812bc3d75e73bbe29cc Signed-off-by: Takashi Kajinami --- copy_logs.sh | 4 -- fixtures/scenario002.pp | 2 - manifests/ironic.pp | 93 ----------------------------------------- manifests/tempest.pp | 6 --- 4 files changed, 105 deletions(-) diff --git a/copy_logs.sh b/copy_logs.sh index ed37ef70e..24bcc928e 100755 --- a/copy_logs.sh +++ b/copy_logs.sh @@ -50,10 +50,6 @@ for project in $PUPPET_MODULES_PATH/*; do if [ -f $project/metadata.json ]; then if egrep -q "opendev.org/openstack/puppet" $project/metadata.json; then PROJECTS+="$(basename $project) " - # if we've added ironic we want to try for ironic-inspector also - if [ "$(basename $project)" == 'ironic' ] ; then - PROJECTS+="ironic-inspector " - fi fi fi done diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp index f8589b010..c5095c878 100644 --- a/fixtures/scenario002.pp +++ b/fixtures/scenario002.pp @@ -70,7 +70,6 @@ class { 'openstack_integration::swift': ceilometer_enabled => true, } class { 'openstack_integration::ironic': - inspector_backend => 'swift', send_power_notifications => true, } include openstack_integration::zaqar @@ -113,7 +112,6 @@ class { 'openstack_integration::tempest': horizon => true, swift => true, ironic => true, - ironic_inspector => true, zaqar => true, attach_encrypted_volume => true, } diff --git a/manifests/ironic.pp b/manifests/ironic.pp index 2e7d82ea6..a04814942 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -4,37 +4,22 @@ # (optional) AMQP topic used for OpenStack notifications # Defaults to undef. # -# [*inspector_backend*] -# (optional) The storage backend for storing introspection data. -# Defaults to 'database'. -# # [*send_power_notifications*] # (optional) Send power notifications to Nova. # Defaults to false # class openstack_integration::ironic ( $notification_topics = undef, - $inspector_backend = 'database', $send_power_notifications = false, ) { include openstack_integration::config include openstack_integration::params if $openstack_integration::config::ssl { - if $facts['os']['family'] != 'RedHat' { - # TODO(tkajinam): ironic-inspector can enable ssl with use_ssl and - # ssl options from oslo.service - fail('ssl is supported only in CentOS and RHEL') - } - openstack_integration::ssl_key { 'ironic': notify => Service['httpd'], require => Anchor['ironic::install::end'], } - openstack_integration::ssl_key { 'ironic-inspector': - notify => Service['httpd'], - require => Anchor['ironic-inspector::install::end'], - } Exec['update-ca-certificates'] ~> Service['httpd'] } @@ -156,82 +141,4 @@ class openstack_integration::ironic ( # shared class { 'ironic::pxe': } - - # ironic-inspector - class { 'ironic::keystone::auth_inspector': - public_url => "${openstack_integration::config::base_url}:5050", - internal_url => "${openstack_integration::config::base_url}:5050", - admin_url => "${openstack_integration::config::base_url}:5050", - roles => ['admin', 'service'], - password => 'a_big_secret', - } - class { 'ironic::inspector::db::mysql': - charset => $openstack_integration::params::mysql_charset, - collate => $openstack_integration::params::mysql_collate, - password => 'ironic-inspector', - host => $openstack_integration::config::host, - } - class { 'ironic::inspector::authtoken': - password => 'a_big_secret', - user_domain_name => 'Default', - project_domain_name => 'Default', - auth_url => $openstack_integration::config::keystone_admin_uri, - www_authenticate_uri => $openstack_integration::config::keystone_auth_uri, - memcached_servers => $openstack_integration::config::memcached_servers, - service_token_roles_required => true, - } - class { 'ironic::inspector::logging': - debug => true, - } - class { 'ironic::inspector::db': - database_connection => os_database_connection({ - 'dialect' => 'mysql+pymysql', - 'host' => $openstack_integration::config::ip_for_url, - 'username' => 'ironic-inspector', - 'password' => 'ironic-inspector', - 'database' => 'ironic-inspector', - 'charset' => 'utf8', - 'extra' => $openstack_integration::config::db_extra, - }), - } - class { 'ironic::inspector::ironic': - password => 'a_big_secret', - auth_url => "${openstack_integration::config::keystone_auth_uri}/v3", - } - class { 'ironic::inspector::swift': - password => 'a_big_secret', - auth_url => "${openstack_integration::config::keystone_auth_uri}/v3", - } - - if $facts['os']['family'] == 'RedHat' { - class { 'ironic::inspector::wsgi::apache': - bind_host => $openstack_integration::config::host, - ssl => $openstack_integration::config::ssl, - ssl_key => "/etc/ironic-inspector/ssl/private/${facts['networking']['fqdn']}.pem", - ssl_cert => $openstack_integration::params::cert_path, - workers => 2, - } - $standalone = false - Service['memcached'] -> Anchor['ironic-inspector::service::begin'] - } else { - $standalone = true - } - class { 'ironic::inspector': - listen_address => $openstack_integration::config::host, - default_transport_url => os_transport_url({ - 'transport' => $openstack_integration::config::messaging_default_proto, - 'host' => $openstack_integration::config::host, - 'port' => $openstack_integration::config::messaging_default_port, - 'username' => 'ironic', - 'password' => 'an_even_bigger_secret', - }), - rabbit_use_ssl => $openstack_integration::config::ssl, - standalone => $standalone, - dnsmasq_interface => 'eth0', - store_data => $inspector_backend, - } - class { 'ironic::inspector::coordination': - backend_url => "memcached://${openstack_integration::config::ip_for_url}:11211", - } - class { 'ironic::inspector::client': } } diff --git a/manifests/tempest.pp b/manifests/tempest.pp index 6197d2fd8..8eb3278a2 100644 --- a/manifests/tempest.pp +++ b/manifests/tempest.pp @@ -52,10 +52,6 @@ # (optional) Define if Ironic needs to be tested. # Default to false. # -# [*ironic_inspector*] -# (optional) Define if Ironic-inspector needs to be tested. -# Default to false. -# # [*l2gw*] # (optional) Define if L2GW needs to be tested. # Default to false. @@ -173,7 +169,6 @@ class openstack_integration::tempest ( $heat = false, $horizon = false, $ironic = false, - $ironic_inspector = false, $l2gw = false, $l2gw_switch = undef, $dr = false, @@ -342,7 +337,6 @@ class openstack_integration::tempest ( heat_available => $heat, swift_available => $swift, ironic_available => $ironic, - ironic_inspector_available => $ironic_inspector, zaqar_available => $zaqar, manila_available => $manila, mistral_available => $mistral,

AltStyle によって変換されたページ (->オリジナル) /