openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Stop testing amqp1 messaging driver"

Browse Source
This commit is contained in:
Zuul 2023-08-16 08:39:10 +00:00 committed by Gerrit Code Review
commit bcf4ffab9b
21 changed files with 7 additions and 123 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -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.

8
copy_logs.sh
View File

@ -258,14 +258,6 @@ if [ -d /etc/redis ]; then
sudo cp -r /etc/redis $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

17
fixtures/scenario001.pp
View File

@ -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':

1
manifests/aodh.pp
View File

@ -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',
}

1
manifests/ceilometer.pp
View File

@ -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'],

1
manifests/cinder.pp
View File

@ -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',

13
manifests/config.pp
View File

@ -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'

1
manifests/heat.pp
View File

@ -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',
}

1
manifests/ironic.pp
View File

@ -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,

3
manifests/keystone.pp
View File

@ -93,9 +93,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,

1
manifests/manila.pp
View File

@ -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',

10
manifests/mq_user.pp
View File

@ -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'],
}
}
}

8
manifests/murano.pp
View File

@ -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'],

1
manifests/neutron.pp
View File

@ -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,

1
manifests/nova.pp
View File

@ -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,

1
manifests/octavia.pp
View File

@ -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',
}

56
manifests/qdr.pp
View File

@ -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,
}
}

1
manifests/sahara.pp
View File

@ -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',

1
manifests/trove.pp
View File

@ -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,

1
manifests/vitrage.pp
View File

@ -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',

1
manifests/watcher.pp
View File

@ -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',