From c1f6ba999e57df3bbc7435cb4a086867cf674a43 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. Depends-on: https://review.opendev.org/861070 Change-Id: I17666d9507564acb05a69143879ca2ec4b0bdeb0 --- README.md | 2 +- copy_logs.sh | 8 ------ fixtures/scenario001.pp | 17 +++---------- 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/manila.pp | 1 - manifests/mq_user.pp | 10 -------- manifests/murano.pp | 8 ------ manifests/neutron.pp | 1 - manifests/nova.pp | 1 - manifests/octavia.pp | 1 - manifests/qdr.pp | 56 ----------------------------------------- manifests/sahara.pp | 1 - manifests/trove.pp | 1 - manifests/vitrage.pp | 1 - manifests/watcher.pp | 1 - 21 files changed, 7 insertions(+), 123 deletions(-) delete mode 100644 manifests/qdr.pp diff --git a/README.md b/README.md index 6d0f003e1..4a3e832e5 100644 --- a/README.md +++ b/README.md @@ -81,7 +81,7 @@ scenario](#all-in-one). | redis | X | X | X | | | | | l2gw | | | | X | | | | octavia | | | | X | X | | -| om rpc | amqp1 | rabbit | rabbit | rabbit | rabbit | rabbit | +| om rpc | rabbit | rabbit | rabbit | rabbit | rabbit | rabbit | | om notify | rabbit | 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 dca2992b2..0853f2dcd 100755 --- a/copy_logs.sh +++ b/copy_logs.sh @@ -265,14 +265,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 e4fc8d569..a28228f3b 100644 --- a/fixtures/scenario001.pp +++ b/fixtures/scenario001.pp @@ -22,14 +22,10 @@ if $facts['os']['name'] == 'Ubuntu' { case $facts['os']['family'] { 'Debian': { - $ipv6 = false - $om_rpc = 'rabbit' - $om_notify = 'rabbit' + $ipv6 = false } 'RedHat': { - $ipv6 = true - $om_rpc = 'amqp' - $om_notify = 'rabbit' + $ipv6 = true } default: { fail("Unsupported osfamily (${facts['os']['family']})") @@ -38,10 +34,8 @@ case $facts['os']['family'] { 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 @@ -49,9 +43,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 include openstack_integration::redis class { 'openstack_integration::keystone': diff --git a/manifests/aodh.pp b/manifests/aodh.pp index ddade2632..cb5ac1e34 100644 --- a/manifests/aodh.pp +++ b/manifests/aodh.pp @@ -54,7 +54,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 169ac88ed..c066ccc34 100644 --- a/manifests/ceilometer.pp +++ b/manifests/ceilometer.pp @@ -57,7 +57,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': roles => ['admin', 'service'], diff --git a/manifests/cinder.pp b/manifests/cinder.pp index 2d38a5c86..56ca5d632 100644 --- a/manifests/cinder.pp +++ b/manifests/cinder.pp @@ -101,7 +101,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 0b720da81..adce95039 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*] @@ -31,11 +30,7 @@ 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' $db_extra = { 'ssl_ca' => $::openstack_integration::params::ca_bundle_cert_path, @@ -43,11 +38,7 @@ class openstack_integration::config ( $ovn_proto = 'ssl' } else { $proto = 'http' - if $rpc_backend == 'amqp' { - $messaging_default_port = '31459' - } else { - $messaging_default_port = '5672' - } + $messaging_default_port = '5672' $messaging_notify_port = '5672' $db_extra = {} $ovn_proto = 'tcp' diff --git a/manifests/heat.pp b/manifests/heat.pp index e47767a0f..5ea588753 100644 --- a/manifests/heat.pp +++ b/manifests/heat.pp @@ -78,7 +78,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 32bba0eee..890dc1ab7 100644 --- a/manifests/ironic.pp +++ b/manifests/ironic.pp @@ -38,7 +38,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 68473f722..918f18fa4 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -94,9 +94,6 @@ class openstack_integration::keystone ( }), rabbit_use_ssl => $::openstack_integration::config::ssl, } - class { 'keystone::messaging::amqp': - amqp_sasl_mechanisms => 'PLAIN', - } class { 'keystone::wsgi::apache': bind_host => $::openstack_integration::config::host, ssl => $::openstack_integration::config::ssl, diff --git a/manifests/manila.pp b/manifests/manila.pp index 2515948a7..ec10c586c 100644 --- a/manifests/manila.pp +++ b/manifests/manila.pp @@ -80,7 +80,6 @@ class openstack_integration::manila ( notification_topics => $notification_topics, notification_driver => 'messagingv2', rabbit_use_ssl => $::openstack_integration::config::ssl, - amqp_sasl_mechanisms => 'PLAIN', } class { 'manila::keystone::authtoken': password => 'a_big_secret', 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 90987cbd3..97ebb360a 100644 --- a/manifests/murano.pp +++ b/manifests/murano.pp @@ -28,14 +28,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 b9d834511..b5935ab44 100644 --- a/manifests/neutron.pp +++ b/manifests/neutron.pp @@ -227,7 +227,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 b14167ac7..2d73c8190 100644 --- a/manifests/nova.pp +++ b/manifests/nova.pp @@ -147,7 +147,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 0d4a32c5e..d4761ca0c 100644 --- a/manifests/octavia.pp +++ b/manifests/octavia.pp @@ -89,7 +89,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/qdr.pp b/manifests/qdr.pp deleted file mode 100644 index 7cea2daa2..000000000 --- a/manifests/qdr.pp +++ /dev/null @@ -1,56 +0,0 @@ -class openstack_integration::qdr { - - include openstack_integration::params - include openstack_integration::config - - if $facts['os']['family'] == 'Debian' { - include apt - Class['apt::update'] -> Package<| provider == 'apt' |> - apt::ppa { 'ppa:qpid/released' : } - package { 'pyngus': - ensure => present, - provider => 'pip' - } - } - - $extra_addresses = [{'prefix' => 'openstack.org/om/rpc/multicast', - 'distribution' => 'multicast'}, - {'prefix' => 'openstack.org/om/rpc/unicast', - 'distribution' => 'closest'}, - {'prefix' => 'openstack.org/om/rpc/anycast', - 'distribution' => 'balanced'}, - {'prefix' => 'openstack.org/om/notify/multicast', - 'distribution' => 'multicast'}, - {'prefix' => 'openstack.org/om/notify/unicast', - 'distribution' => 'closest'}, - {'prefix' => 'openstack.org/om/notify/anycast', - 'distribution' => 'balanced'}] - - if $::openstack_integration::config::ssl { - file { '/etc/qpid-dispatch/ssl/private': - ensure => directory, - owner => 'root', - mode => '0755', - selinux_ignore_defaults => true, - before => File["/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem"], - } - openstack_integration::ssl_key { 'qdrouterd': - key_path => "/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem", - require => File['/etc/qpid-dispatch/ssl/private'], - notify => Service['qdrouterd'], - } - } - - class { 'qdr': - listener_require_ssl => $::openstack_integration::config::ssl, - listener_ssl_cert_db => $::openstack_integration::params::ca_bundle_cert_path, - listener_ssl_cert_file => $::openstack_integration::params::cert_path, - listener_ssl_key_file => "/etc/qpid-dispatch/ssl/private/${facts['networking']['fqdn']}.pem", - listener_addr => $::openstack_integration::config::host, - listener_port => $::openstack_integration::config::messaging_default_port, - listener_sasl_mech => 'PLAIN', - listener_auth_peer => true, - extra_addresses => $extra_addresses, - router_worker_threads => 2, - } -} diff --git a/manifests/sahara.pp b/manifests/sahara.pp index 97b35f54b..23eb065ea 100644 --- a/manifests/sahara.pp +++ b/manifests/sahara.pp @@ -62,7 +62,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 0157c6d0a..d426ff7a4 100644 --- a/manifests/trove.pp +++ b/manifests/trove.pp @@ -46,7 +46,6 @@ class openstack_integration::trove { 'password' => 'an_even_bigger_secret', }), 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 2a21735cf..803a6a7c2 100644 --- a/manifests/vitrage.pp +++ b/manifests/vitrage.pp @@ -58,7 +58,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 a2c33df0f..9f783468f 100644 --- a/manifests/watcher.pp +++ b/manifests/watcher.pp @@ -68,7 +68,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',