From 0a8901e98804ca8d9ef68d3e913fa8f85b04b3ae Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Mon, 14 Aug 2023 23:12:31 +0900 Subject: [PATCH] Stop testing amqp1 messaging driver amqp1 driver of the oslo.messaging library was deprecated and it is no longer tested. This replaces usage of the driver by the RabbitMQ driver. Conflicts: fixtures/scenario001.pp manifests/keystone.pp manifests/manila.pp manifests/qdr.pp Change-Id: I17666d9507564acb05a69143879ca2ec4b0bdeb0 (cherry picked from commit c1f6ba999e57df3bbc7435cb4a086867cf674a43) (cherry picked from commit 03b5574aa44bb20978032d0f0295437b18b488da) (cherry picked from commit d6b05a6b7436b164e3e4bd09657db699b0953c31) --- README.md | 2 +- copy_logs.sh | 8 -------- fixtures/scenario001.pp | 13 ++----------- manifests/aodh.pp | 1 - manifests/ceilometer.pp | 1 - manifests/cinder.pp | 1 - manifests/config.pp | 13 ++----------- manifests/heat.pp | 1 - manifests/ironic.pp | 1 - manifests/keystone.pp | 3 --- manifests/mq_user.pp | 10 ---------- manifests/murano.pp | 8 -------- manifests/neutron.pp | 1 - manifests/nova.pp | 1 - manifests/octavia.pp | 1 - manifests/sahara.pp | 1 - manifests/trove.pp | 1 - manifests/vitrage.pp | 1 - manifests/watcher.pp | 1 - 19 files changed, 5 insertions(+), 64 deletions(-) diff --git a/README.md b/README.md index c2250f320..048a38ec9 100644 --- a/README.md +++ b/README.md @@ -78,7 +78,7 @@ scenario](#all-in-one). | redis | X | X | | | | | l2gw | | | | X | | | octavia | | | | X | | -| om rpc | amqp1 | rabbit | rabbit | rabbit | rabbit | +| om rpc | rabbit | rabbit | rabbit | rabbit | rabbit | | om notify | rabbit | rabbit | rabbit | rabbit | rabbit | When the Jenkins slave is created, the *run_tests.sh* script will be executed. diff --git a/copy_logs.sh b/copy_logs.sh index ee3a5fdd4..01765877d 100755 --- a/copy_logs.sh +++ b/copy_logs.sh @@ -224,14 +224,6 @@ elif [ -f /etc/redis.conf ]; then sudo cp /etc/redis.conf $LOG_DIR/etc/ fi -if [ -f /var/log/qdrouterd/qdrouterd.log ]; then - sudo cp /var/log/qdrouterd/qdrouterd.log $LOG_DIR/qdrouterd.log.txt - if [ -f /etc/qpid-dispatch/qdrouterd.conf ]; then - mkdir $LOG_DIR/qdrouterd_config - sudo cp /etc/qpid-dispatch/qdrouterd.conf $LOG_DIR/qdrouterd_config/qdrouterd.conf.txt - fi -fi - if [ -d /var/log/audit/ ]; then sudo cp /var/log/audit/audit.log $LOG_DIR/audit.log.txt || true fi diff --git a/fixtures/scenario001.pp b/fixtures/scenario001.pp index f0dd94cea..3204c82eb 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -25,15 +25,11 @@ case $::osfamily { $ipv6 = false # vitrage are not packaged yet in debian/ubuntu $enable_vitrage = false - $om_rpc = 'rabbit' - $om_notify = 'rabbit' $notification_topics = $::os_service_default } 'RedHat': { $ipv6 = true $enable_vitrage = true - $om_rpc = 'amqp' - $om_notify = 'rabbit' $notification_topics = ['notifications', 'vitrage_notifications'] } default: { @@ -43,10 +39,8 @@ case $::osfamily { include openstack_integration class { 'openstack_integration::config': - ssl => $ssl, - ipv6 => $ipv6, - rpc_backend => $om_rpc, - notify_backend => $om_notify, + ssl => $ssl, + ipv6 => $ipv6, } if $ssl { include openstack_integration::cacert @@ -54,9 +48,6 @@ if $ssl { include openstack_integration::apache include openstack_integration::memcached include openstack_integration::rabbitmq -if ($om_rpc == 'amqp') { - include openstack_integration::qdr -} include openstack_integration::mysql class { 'openstack_integration::keystone': # NOTE(sileht): Telemetry autoscaling tempest tests can't renew token, so we diff --git a/manifests/aodh.pp b/manifests/aodh.pp index 90f62cb5a..604eb648f 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -46,7 +46,6 @@ class openstack_integration::aodh ( 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', notification_topics => $notification_topics, notification_driver => 'messagingv2', } diff --git a/manifests/ceilometer.pp b/manifests/ceilometer.pp index c88c86969..20f490fb8 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -52,7 +52,6 @@ class openstack_integration::ceilometer ( 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', } class { 'ceilometer::keystone::auth': password => 'a_big_secret', diff --git a/manifests/cinder.pp b/manifests/cinder.pp index e00411b25..a39b85078 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -85,7 +85,6 @@ class openstack_integration::cinder ( notification_topics => $notification_topics, notification_driver => 'messagingv2', rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', } class { 'cinder::keystone::authtoken': password => 'a_big_secret', diff --git a/manifests/config.pp b/manifests/config.pp index bcf812b08..9dcaaa3ce 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -10,7 +10,6 @@ # # [*rpc_backend*] # (optional) The oslo.messaging backend to configure for rpc. -# Possible values include rabbit, amqp # Defaults to 'rabbit'. # # [*notify_backend*] @@ -29,19 +28,11 @@ class openstack_integration::config ( if $ssl { $proto = 'https' - if $rpc_backend == 'amqp' { - $messaging_default_port = '31459' - } else { - $messaging_default_port = '5671' - } + $messaging_default_port = '5671' $messaging_notify_port = '5671' } else { $proto = 'http' - if $rpc_backend == 'amqp' { - $messaging_default_port = '31459' - } else { - $messaging_default_port = '5672' - } + $messaging_default_port = '5672' $messaging_notify_port = '5672' } diff --git a/manifests/heat.pp b/manifests/heat.pp index 9b4b0f01b..d8c0651f6 100644 --- a/manifests/heat.pp +++ b/manifests/heat.pp @@ -59,7 +59,6 @@ class openstack_integration::heat ( 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', notification_topics => $notification_topics, notification_driver => 'messagingv2', } diff --git a/manifests/ironic.pp b/manifests/ironic.pp index b18e67000..f703faee7 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -30,7 +30,6 @@ class openstack_integration::ironic { 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', } class { 'ironic::db::mysql': charset => $::openstack_integration::params::mysql_charset, diff --git a/manifests/keystone.pp b/manifests/keystone.pp index 3ff1a538c..134d763e8 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -82,9 +82,6 @@ class openstack_integration::keystone ( }), rabbit_use_ssl => $::openstack_integration::config::ssl, } - class { 'keystone::messaging::amqp': - amqp_sasl_mechanisms => 'PLAIN', - } include apache class { 'keystone::wsgi::apache': bind_host => $::openstack_integration::config::ip_for_url, diff --git a/manifests/mq_user.pp b/manifests/mq_user.pp index d343bbf1c..6754ae4d4 100644 --- a/manifests/mq_user.pp +++ b/manifests/mq_user.pp @@ -34,14 +34,4 @@ define openstack_integration::mq_user ( provider => 'rabbitmqctl', require => Class['rabbitmq'], } - - if $::openstack_integration::config::messaging_default_proto == 'amqp' { - include openstack_integration::qdr - - qdr_user { $name: - password => $password, - provider => 'sasl', - require => Class['qdr'], - } - } } diff --git a/manifests/murano.pp b/manifests/murano.pp index 77d062ce3..ec5d30bbc 100644 --- a/manifests/murano.pp +++ b/manifests/murano.pp @@ -23,14 +23,6 @@ class openstack_integration::murano { require => [ Class['rabbitmq'], Rabbitmq_vhost['/murano'] ], } - if $::openstack_integration::config::messaging_default_proto == 'amqp' { - qdr_user { 'murano': - password => 'an_even_bigger_secret', - provider => 'sasl', - require => Class['qdr'], - } - } - if $::openstack_integration::config::ssl { openstack_integration::ssl_key { 'murano': notify => Service['murano-api'], diff --git a/manifests/neutron.pp b/manifests/neutron.pp index 8af8800c0..63693a55d 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -192,7 +192,6 @@ class openstack_integration::neutron ( 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', core_plugin => 'ml2', service_plugins => $plugins_list, bind_host => $::openstack_integration::config::host, diff --git a/manifests/nova.pp b/manifests/nova.pp index 38843a268..c3c9617a6 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -123,7 +123,6 @@ class openstack_integration::nova ( default_transport_url => $default_transport_url, notification_transport_url => $notification_transport_url, rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', notification_driver => 'messagingv2', notify_on_state_change => 'vm_and_task_state', notification_topics => $notification_topics, diff --git a/manifests/octavia.pp b/manifests/octavia.pp index faa1f3412..42cc399f1 100644 --- a/manifests/octavia.pp +++ b/manifests/octavia.pp @@ -46,7 +46,6 @@ class openstack_integration::octavia ( 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', notification_topics => $notification_topics, notification_driver => 'messagingv2', } diff --git a/manifests/sahara.pp b/manifests/sahara.pp index 60aa49789..597aa4df9 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -55,7 +55,6 @@ class openstack_integration::sahara ( 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', } class { 'sahara::keystone::authtoken': password => 'a_big_secret', diff --git a/manifests/trove.pp b/manifests/trove.pp index 30b5e64e8..e3b7b45bb 100644 --- a/manifests/trove.pp +++ b/manifests/trove.pp @@ -41,7 +41,6 @@ class openstack_integration::trove { }), database_connection => 'mysql+pymysql://trove:trove@127.0.0.1/trove?charset=utf8', rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', } class { 'trove::db::mysql': charset => $::openstack_integration::params::mysql_charset, diff --git a/manifests/vitrage.pp b/manifests/vitrage.pp index d4d631ae0..c2506cd5f 100644 --- a/manifests/vitrage.pp +++ b/manifests/vitrage.pp @@ -49,7 +49,6 @@ class openstack_integration::vitrage { 'password' => 'an_even_bigger_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', snapshots_interval => 120, types => 'nova.host,nova.instance,nova.zone,cinder.volume,neutron.port,neutron.network,doctor', notification_driver => 'messagingv2', diff --git a/manifests/watcher.pp b/manifests/watcher.pp index e07849273..5ecb39f11 100644 --- a/manifests/watcher.pp +++ b/manifests/watcher.pp @@ -58,7 +58,6 @@ class openstack_integration::watcher { 'password' => 'my_secret', }), rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', } class { 'watcher::watcher_clients_auth': password => 'a_big_secret',