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 commitc1f6ba999e
) (cherry picked from commit03b5574aa4
) (cherry picked from commitd6b05a6b74
)
This commit is contained in:
parent
be6b31b996
commit
0a8901e988
|
@ -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.
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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',
|
||||
}
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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'
|
||||
}
|
||||
|
||||
|
|
|
@ -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',
|
||||
}
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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'],
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
@ -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'],
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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',
|
||||
}
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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',
|
||||
|
|
|
@ -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',
|
||||
|
|
Loading…
Reference in New Issue