Deprecate oslo.messaging rpc_backend option parameter
Oslo.messaging uses the transport_url to represent the rpc and notification messaging driver to use and its full configuration. The rpc_backend configuration option is deprecated for removal and should not gate oslo.messaging driver configuration options. This patch: * deprecate rpc_backend * remove conditional check * update spec tests * add release note Change-Id: Idbd5c231d85a0f4d249dabd14bc829844ee3e83d
This commit is contained in:
Andrew Smith
parent
3fdefbfb46
commit
6e1a56adb1
@ -292,46 +292,40 @@ the future release. Please use trove::api::package_ensure instead.")
|
||||
topics => $::trove::notification_topics
|
||||
}
|
||||
|
||||
if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit' {
|
||||
oslo::messaging::rabbit {'trove_config':
|
||||
rabbit_hosts => $::trove::rabbit_hosts,
|
||||
rabbit_host => $::trove::rabbit_host,
|
||||
rabbit_port => $::trove::rabbit_port,
|
||||
rabbit_ha_queues => $::trove::rabbit_ha_queues,
|
||||
rabbit_userid => $::trove::rabbit_userid,
|
||||
rabbit_password => $::trove::rabbit_password,
|
||||
rabbit_virtual_host => $::trove::rabbit_virtual_host,
|
||||
rabbit_use_ssl => $::trove::rabbit_use_ssl,
|
||||
kombu_reconnect_delay => $::trove::kombu_reconnect_delay,
|
||||
amqp_durable_queues => $::trove::amqp_durable_queues,
|
||||
kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $::trove::kombu_ssl_certfile,
|
||||
kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile,
|
||||
kombu_ssl_version => $::trove::kombu_ssl_version
|
||||
}
|
||||
} elsif $::trove::rpc_backend == 'amqp' {
|
||||
oslo::messaging::amqp { 'trove_config':
|
||||
server_request_prefix => $::trove::amqp_server_request_prefix,
|
||||
broadcast_prefix => $::trove::amqp_broadcast_prefix,
|
||||
group_request_prefix => $::trove::amqp_group_request_prefix,
|
||||
container_name => $::trove::amqp_container_name,
|
||||
idle_timeout => $::trove::amqp_idle_timeout,
|
||||
trace => $::trove::amqp_trace,
|
||||
ssl_ca_file => $::trove::amqp_ssl_ca_file,
|
||||
ssl_cert_file => $::trove::amqp_ssl_cert_file,
|
||||
ssl_key_file => $::trove::amqp_ssl_key_file,
|
||||
ssl_key_password => $::trove::amqp_ssl_key_password,
|
||||
allow_insecure_clients => $::trove::amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $::trove::amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $::trove::amqp_sasl_config_dir,
|
||||
sasl_config_name => $::trove::amqp_sasl_config_name,
|
||||
username => $::trove::amqp_username,
|
||||
password => $::trove::amqp_password,
|
||||
}
|
||||
} else {
|
||||
trove_config {
|
||||
'DEFAULT/rpc_backend' : value => $::trove::rpc_backend;
|
||||
}
|
||||
oslo::messaging::rabbit {'trove_config':
|
||||
rabbit_hosts => $::trove::rabbit_hosts,
|
||||
rabbit_host => $::trove::rabbit_host,
|
||||
rabbit_port => $::trove::rabbit_port,
|
||||
rabbit_ha_queues => $::trove::rabbit_ha_queues,
|
||||
rabbit_userid => $::trove::rabbit_userid,
|
||||
rabbit_password => $::trove::rabbit_password,
|
||||
rabbit_virtual_host => $::trove::rabbit_virtual_host,
|
||||
rabbit_use_ssl => $::trove::rabbit_use_ssl,
|
||||
kombu_reconnect_delay => $::trove::kombu_reconnect_delay,
|
||||
amqp_durable_queues => $::trove::amqp_durable_queues,
|
||||
kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $::trove::kombu_ssl_certfile,
|
||||
kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile,
|
||||
kombu_ssl_version => $::trove::kombu_ssl_version
|
||||
}
|
||||
|
||||
oslo::messaging::amqp { 'trove_config':
|
||||
server_request_prefix => $::trove::amqp_server_request_prefix,
|
||||
broadcast_prefix => $::trove::amqp_broadcast_prefix,
|
||||
group_request_prefix => $::trove::amqp_group_request_prefix,
|
||||
container_name => $::trove::amqp_container_name,
|
||||
idle_timeout => $::trove::amqp_idle_timeout,
|
||||
trace => $::trove::amqp_trace,
|
||||
ssl_ca_file => $::trove::amqp_ssl_ca_file,
|
||||
ssl_cert_file => $::trove::amqp_ssl_cert_file,
|
||||
ssl_key_file => $::trove::amqp_ssl_key_file,
|
||||
ssl_key_password => $::trove::amqp_ssl_key_password,
|
||||
allow_insecure_clients => $::trove::amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $::trove::amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $::trove::amqp_sasl_config_dir,
|
||||
sasl_config_name => $::trove::amqp_sasl_config_name,
|
||||
username => $::trove::amqp_username,
|
||||
password => $::trove::amqp_password,
|
||||
}
|
||||
|
||||
trove::generic_service { 'api':
|
||||
|
||||
@ -151,46 +151,40 @@ the future release. Please use trove::conductor::package_ensure instead.")
|
||||
topics => $::trove::notification_topics
|
||||
}
|
||||
|
||||
if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit' {
|
||||
oslo::messaging::rabbit {'trove_conductor_config':
|
||||
rabbit_hosts => $::trove::rabbit_hosts,
|
||||
rabbit_host => $::trove::rabbit_host,
|
||||
rabbit_port => $::trove::rabbit_port,
|
||||
rabbit_ha_queues => $::trove::rabbit_ha_queues,
|
||||
rabbit_userid => $::trove::rabbit_userid,
|
||||
rabbit_password => $::trove::rabbit_password,
|
||||
rabbit_virtual_host => $::trove::rabbit_virtual_host,
|
||||
rabbit_use_ssl => $::trove::rabbit_use_ssl,
|
||||
kombu_reconnect_delay => $::trove::kombu_reconnect_delay,
|
||||
amqp_durable_queues => $::trove::amqp_durable_queues,
|
||||
kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $::trove::kombu_ssl_certfile,
|
||||
kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile,
|
||||
kombu_ssl_version => $::trove::kombu_ssl_version
|
||||
}
|
||||
} elsif $::trove::rpc_backend == 'amqp' {
|
||||
oslo::messaging::amqp { 'trove_conductor_config':
|
||||
server_request_prefix => $::trove::amqp_server_request_prefix,
|
||||
broadcast_prefix => $::trove::amqp_broadcast_prefix,
|
||||
group_request_prefix => $::trove::amqp_group_request_prefix,
|
||||
container_name => $::trove::amqp_container_name,
|
||||
idle_timeout => $::trove::amqp_idle_timeout,
|
||||
trace => $::trove::amqp_trace,
|
||||
ssl_ca_file => $::trove::amqp_ssl_ca_file,
|
||||
ssl_cert_file => $::trove::amqp_ssl_cert_file,
|
||||
ssl_key_file => $::trove::amqp_ssl_key_file,
|
||||
ssl_key_password => $::trove::amqp_ssl_key_password,
|
||||
allow_insecure_clients => $::trove::amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $::trove::amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $::trove::amqp_sasl_config_dir,
|
||||
sasl_config_name => $::trove::amqp_sasl_config_name,
|
||||
username => $::trove::amqp_username,
|
||||
password => $::trove::amqp_password,
|
||||
}
|
||||
} else {
|
||||
trove_conductor_config {
|
||||
'DEFAULT/rpc_backend' : value => $::trove::rpc_backend
|
||||
}
|
||||
oslo::messaging::rabbit {'trove_conductor_config':
|
||||
rabbit_hosts => $::trove::rabbit_hosts,
|
||||
rabbit_host => $::trove::rabbit_host,
|
||||
rabbit_port => $::trove::rabbit_port,
|
||||
rabbit_ha_queues => $::trove::rabbit_ha_queues,
|
||||
rabbit_userid => $::trove::rabbit_userid,
|
||||
rabbit_password => $::trove::rabbit_password,
|
||||
rabbit_virtual_host => $::trove::rabbit_virtual_host,
|
||||
rabbit_use_ssl => $::trove::rabbit_use_ssl,
|
||||
kombu_reconnect_delay => $::trove::kombu_reconnect_delay,
|
||||
amqp_durable_queues => $::trove::amqp_durable_queues,
|
||||
kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $::trove::kombu_ssl_certfile,
|
||||
kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile,
|
||||
kombu_ssl_version => $::trove::kombu_ssl_version
|
||||
}
|
||||
|
||||
oslo::messaging::amqp { 'trove_conductor_config':
|
||||
server_request_prefix => $::trove::amqp_server_request_prefix,
|
||||
broadcast_prefix => $::trove::amqp_broadcast_prefix,
|
||||
group_request_prefix => $::trove::amqp_group_request_prefix,
|
||||
container_name => $::trove::amqp_container_name,
|
||||
idle_timeout => $::trove::amqp_idle_timeout,
|
||||
trace => $::trove::amqp_trace,
|
||||
ssl_ca_file => $::trove::amqp_ssl_ca_file,
|
||||
ssl_cert_file => $::trove::amqp_ssl_cert_file,
|
||||
ssl_key_file => $::trove::amqp_ssl_key_file,
|
||||
ssl_key_password => $::trove::amqp_ssl_key_password,
|
||||
allow_insecure_clients => $::trove::amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $::trove::amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $::trove::amqp_sasl_config_dir,
|
||||
sasl_config_name => $::trove::amqp_sasl_config_name,
|
||||
username => $::trove::amqp_username,
|
||||
password => $::trove::amqp_password,
|
||||
}
|
||||
|
||||
oslo::log { 'trove_conductor_config':
|
||||
|
||||
@ -192,46 +192,40 @@ trove::control_exchange instead.")
|
||||
topics => $::trove::notification_topics
|
||||
}
|
||||
|
||||
if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit' {
|
||||
oslo::messaging::rabbit {'trove_guestagent_config':
|
||||
rabbit_hosts => $rabbit_hosts,
|
||||
rabbit_host => $rabbit_host,
|
||||
rabbit_port => $rabbit_port,
|
||||
rabbit_use_ssl => $rabbit_use_ssl,
|
||||
rabbit_ha_queues => $::trove::rabbit_ha_queues,
|
||||
rabbit_userid => $::trove::rabbit_userid,
|
||||
rabbit_password => $::trove::rabbit_password,
|
||||
rabbit_virtual_host => $::trove::rabbit_virtual_host,
|
||||
kombu_reconnect_delay => $::trove::kombu_reconnect_delay,
|
||||
amqp_durable_queues => $::trove::amqp_durable_queues,
|
||||
kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $::trove::kombu_ssl_certfile,
|
||||
kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile,
|
||||
kombu_ssl_version => $::trove::kombu_ssl_version
|
||||
}
|
||||
} elsif $::trove::rpc_backend == 'amqp' {
|
||||
oslo::messaging::amqp { 'trove_guestagent_config':
|
||||
server_request_prefix => $::trove::amqp_server_request_prefix,
|
||||
broadcast_prefix => $::trove::amqp_broadcast_prefix,
|
||||
group_request_prefix => $::trove::amqp_group_request_prefix,
|
||||
container_name => $::trove::amqp_container_name,
|
||||
idle_timeout => $::trove::amqp_idle_timeout,
|
||||
trace => $::trove::amqp_trace,
|
||||
ssl_ca_file => $::trove::amqp_ssl_ca_file,
|
||||
ssl_cert_file => $::trove::amqp_ssl_cert_file,
|
||||
ssl_key_file => $::trove::amqp_ssl_key_file,
|
||||
ssl_key_password => $::trove::amqp_ssl_key_password,
|
||||
allow_insecure_clients => $::trove::amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $::trove::amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $::trove::amqp_sasl_config_dir,
|
||||
sasl_config_name => $::trove::amqp_sasl_config_name,
|
||||
username => $::trove::amqp_username,
|
||||
password => $::trove::amqp_password,
|
||||
}
|
||||
} else {
|
||||
trove_guestagent_config {
|
||||
'DEFAULT/rpc_backend' : value => $::trove::rpc_backend
|
||||
}
|
||||
oslo::messaging::rabbit {'trove_guestagent_config':
|
||||
rabbit_hosts => $rabbit_hosts,
|
||||
rabbit_host => $rabbit_host,
|
||||
rabbit_port => $rabbit_port,
|
||||
rabbit_use_ssl => $rabbit_use_ssl,
|
||||
rabbit_ha_queues => $::trove::rabbit_ha_queues,
|
||||
rabbit_userid => $::trove::rabbit_userid,
|
||||
rabbit_password => $::trove::rabbit_password,
|
||||
rabbit_virtual_host => $::trove::rabbit_virtual_host,
|
||||
kombu_reconnect_delay => $::trove::kombu_reconnect_delay,
|
||||
amqp_durable_queues => $::trove::amqp_durable_queues,
|
||||
kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $::trove::kombu_ssl_certfile,
|
||||
kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile,
|
||||
kombu_ssl_version => $::trove::kombu_ssl_version
|
||||
}
|
||||
|
||||
oslo::messaging::amqp { 'trove_guestagent_config':
|
||||
server_request_prefix => $::trove::amqp_server_request_prefix,
|
||||
broadcast_prefix => $::trove::amqp_broadcast_prefix,
|
||||
group_request_prefix => $::trove::amqp_group_request_prefix,
|
||||
container_name => $::trove::amqp_container_name,
|
||||
idle_timeout => $::trove::amqp_idle_timeout,
|
||||
trace => $::trove::amqp_trace,
|
||||
ssl_ca_file => $::trove::amqp_ssl_ca_file,
|
||||
ssl_cert_file => $::trove::amqp_ssl_cert_file,
|
||||
ssl_key_file => $::trove::amqp_ssl_key_file,
|
||||
ssl_key_password => $::trove::amqp_ssl_key_password,
|
||||
allow_insecure_clients => $::trove::amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $::trove::amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $::trove::amqp_sasl_config_dir,
|
||||
sasl_config_name => $::trove::amqp_sasl_config_name,
|
||||
username => $::trove::amqp_username,
|
||||
password => $::trove::amqp_password,
|
||||
}
|
||||
|
||||
oslo::log { 'trove_guestagent_config':
|
||||
|
||||
@ -82,12 +82,6 @@
|
||||
# (optional) Define queues as "durable" to rabbitmq.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*rpc_backend*]
|
||||
# (optional) The rpc backend implementation to use, can be:
|
||||
# rabbit (for rabbitmq)
|
||||
# amqp (for AMQP 1.0)
|
||||
# Defaults to 'rabbit'
|
||||
#
|
||||
# [*amqp_server_request_prefix*]
|
||||
# (Optional) Address prefix used when sending to a specific server
|
||||
# Defaults to $::os_service_default.
|
||||
@ -292,6 +286,12 @@
|
||||
# (optional) The RabbitMQ virtual host.
|
||||
# Defaults to $::os_service_default
|
||||
#
|
||||
# [*rpc_backend*]
|
||||
# (optional) The rpc backend implementation to use, can be:
|
||||
# rabbit (for rabbitmq)
|
||||
# amqp (for AMQP 1.0)
|
||||
# Defaults to 'rabbit'
|
||||
#
|
||||
class trove(
|
||||
$nova_proxy_admin_pass,
|
||||
$default_transport_url = $::os_service_default,
|
||||
@ -331,7 +331,6 @@ class trove(
|
||||
$database_max_pool_size = undef,
|
||||
$database_max_overflow = undef,
|
||||
$single_tenant_mode = false,
|
||||
$rpc_backend = 'rabbit',
|
||||
$nova_compute_url = false,
|
||||
$nova_proxy_admin_user = 'admin',
|
||||
$nova_proxy_admin_tenant_name = 'admin',
|
||||
@ -356,6 +355,7 @@ class trove(
|
||||
$rabbit_port = $::os_service_default,
|
||||
$rabbit_userid = $::os_service_default,
|
||||
$rabbit_virtual_host = $::os_service_default,
|
||||
$rpc_backend = 'rabbit',
|
||||
) {
|
||||
|
||||
include ::trove::deps
|
||||
@ -367,10 +367,12 @@ class trove(
|
||||
!is_service_default($rabbit_password) or
|
||||
!is_service_default($rabbit_port) or
|
||||
!is_service_default($rabbit_userid) or
|
||||
!is_service_default($rabbit_virtual_host) {
|
||||
!is_service_default($rabbit_virtual_host) or
|
||||
!is_service_default($rpc_backend) {
|
||||
warning("trove::rabbit_host, trove::rabbit_hosts, trove::rabbit_password, \
|
||||
trove::rabbit_port, trove::rabbit_userid and trove::rabbit_virtual_host are \
|
||||
deprecated. Please use trove::default_transport_url instead.")
|
||||
trove::rabbit_port, trove::rabbit_userid, trove::rabbit_virtual_host and \
|
||||
trove::rpc_backend are deprecated. Please use trove::default_transport_url \
|
||||
instead.")
|
||||
}
|
||||
|
||||
if $nova_compute_url {
|
||||
|
||||
@ -206,46 +206,40 @@ the future release. Please use trove::default_neutron_networks instead.")
|
||||
topics => $::trove::notification_topics
|
||||
}
|
||||
|
||||
if $::trove::rpc_backend == 'trove.openstack.common.rpc.impl_kombu' or $::trove::rpc_backend == 'rabbit' {
|
||||
oslo::messaging::rabbit { 'trove_taskmanager_config':
|
||||
rabbit_hosts => $::trove::rabbit_hosts,
|
||||
rabbit_host => $::trove::rabbit_host,
|
||||
rabbit_port => $::trove::rabbit_port,
|
||||
rabbit_ha_queues => $::trove::rabbit_ha_queues,
|
||||
rabbit_userid => $::trove::rabbit_userid,
|
||||
rabbit_password => $::trove::rabbit_password,
|
||||
rabbit_virtual_host => $::trove::rabbit_virtual_host,
|
||||
rabbit_use_ssl => $::trove::rabbit_use_ssl,
|
||||
kombu_reconnect_delay => $::trove::kombu_reconnect_delay,
|
||||
amqp_durable_queues => $::trove::amqp_durable_queues,
|
||||
kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $::trove::kombu_ssl_certfile,
|
||||
kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile,
|
||||
kombu_ssl_version => $::trove::kombu_ssl_version
|
||||
}
|
||||
} elsif $::trove::rpc_backend == 'amqp' {
|
||||
oslo::messaging::amqp { 'trove_taskmanager_config':
|
||||
server_request_prefix => $::trove::amqp_server_request_prefix,
|
||||
broadcast_prefix => $::trove::amqp_broadcast_prefix,
|
||||
group_request_prefix => $::trove::amqp_group_request_prefix,
|
||||
container_name => $::trove::amqp_container_name,
|
||||
idle_timeout => $::trove::amqp_idle_timeout,
|
||||
trace => $::trove::amqp_trace,
|
||||
ssl_ca_file => $::trove::amqp_ssl_ca_file,
|
||||
ssl_cert_file => $::trove::amqp_ssl_cert_file,
|
||||
ssl_key_file => $::trove::amqp_ssl_key_file,
|
||||
ssl_key_password => $::trove::amqp_ssl_key_password,
|
||||
allow_insecure_clients => $::trove::amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $::trove::amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $::trove::amqp_sasl_config_dir,
|
||||
sasl_config_name => $::trove::amqp_sasl_config_name,
|
||||
username => $::trove::amqp_username,
|
||||
password => $::trove::amqp_password,
|
||||
}
|
||||
} else {
|
||||
trove_taskmanager_config {
|
||||
'DEFAULT/rpc_backend' : value => $::trove::rpc_backend
|
||||
}
|
||||
oslo::messaging::rabbit { 'trove_taskmanager_config':
|
||||
rabbit_hosts => $::trove::rabbit_hosts,
|
||||
rabbit_host => $::trove::rabbit_host,
|
||||
rabbit_port => $::trove::rabbit_port,
|
||||
rabbit_ha_queues => $::trove::rabbit_ha_queues,
|
||||
rabbit_userid => $::trove::rabbit_userid,
|
||||
rabbit_password => $::trove::rabbit_password,
|
||||
rabbit_virtual_host => $::trove::rabbit_virtual_host,
|
||||
rabbit_use_ssl => $::trove::rabbit_use_ssl,
|
||||
kombu_reconnect_delay => $::trove::kombu_reconnect_delay,
|
||||
amqp_durable_queues => $::trove::amqp_durable_queues,
|
||||
kombu_ssl_ca_certs => $::trove::kombu_ssl_ca_certs,
|
||||
kombu_ssl_certfile => $::trove::kombu_ssl_certfile,
|
||||
kombu_ssl_keyfile => $::trove::kombu_ssl_keyfile,
|
||||
kombu_ssl_version => $::trove::kombu_ssl_version
|
||||
}
|
||||
|
||||
oslo::messaging::amqp { 'trove_taskmanager_config':
|
||||
server_request_prefix => $::trove::amqp_server_request_prefix,
|
||||
broadcast_prefix => $::trove::amqp_broadcast_prefix,
|
||||
group_request_prefix => $::trove::amqp_group_request_prefix,
|
||||
container_name => $::trove::amqp_container_name,
|
||||
idle_timeout => $::trove::amqp_idle_timeout,
|
||||
trace => $::trove::amqp_trace,
|
||||
ssl_ca_file => $::trove::amqp_ssl_ca_file,
|
||||
ssl_cert_file => $::trove::amqp_ssl_cert_file,
|
||||
ssl_key_file => $::trove::amqp_ssl_key_file,
|
||||
ssl_key_password => $::trove::amqp_ssl_key_password,
|
||||
allow_insecure_clients => $::trove::amqp_allow_insecure_clients,
|
||||
sasl_mechanisms => $::trove::amqp_sasl_mechanisms,
|
||||
sasl_config_dir => $::trove::amqp_sasl_config_dir,
|
||||
sasl_config_name => $::trove::amqp_sasl_config_name,
|
||||
username => $::trove::amqp_username,
|
||||
password => $::trove::amqp_password,
|
||||
}
|
||||
|
||||
if $::trove::use_neutron {
|
||||
|
||||
@ -0,0 +1,4 @@
|
||||
---
|
||||
deprecations:
|
||||
- trove::rpc_backend is deprecated and will be removed in a future
|
||||
release. Please use trove::default_transport_url instead.
|
||||
@ -340,7 +340,7 @@ describe 'trove::api' do
|
||||
let :pre_condition do
|
||||
"class { 'trove' :
|
||||
nova_proxy_admin_pass => 'verysecrete',
|
||||
rpc_backend => 'amqp' }
|
||||
}
|
||||
class { '::trove::keystone::authtoken':
|
||||
password => 'a_big_secret',
|
||||
}"
|
||||
|
||||
@ -202,11 +202,10 @@ describe 'trove::conductor' do
|
||||
end
|
||||
end
|
||||
|
||||
context 'with amqp rpc' do
|
||||
context 'with amqp messaging' do
|
||||
let :pre_condition do
|
||||
"class { 'trove' :
|
||||
nova_proxy_admin_pass => 'verysecrete',
|
||||
rpc_backend => 'amqp' }"
|
||||
nova_proxy_admin_pass => 'verysecrete'}"
|
||||
end
|
||||
|
||||
it do
|
||||
|
||||
@ -223,11 +223,10 @@ describe 'trove::guestagent' do
|
||||
end
|
||||
end
|
||||
|
||||
context 'with amqp rpc' do
|
||||
context 'with amqp messaging' do
|
||||
let :pre_condition do
|
||||
"class { 'trove' :
|
||||
nova_proxy_admin_pass => 'verysecrete',
|
||||
rpc_backend => 'amqp' }"
|
||||
nova_proxy_admin_pass => 'verysecrete'}"
|
||||
end
|
||||
|
||||
it do
|
||||
|
||||
@ -305,11 +305,10 @@ describe 'trove::taskmanager' do
|
||||
end
|
||||
end
|
||||
|
||||
context 'with amqp rpc' do
|
||||
context 'with amqp messaging' do
|
||||
let :pre_condition do
|
||||
"class { 'trove' :
|
||||
nova_proxy_admin_pass => 'verysecrete',
|
||||
rpc_backend => 'amqp' }"
|
||||
nova_proxy_admin_pass => 'verysecrete'}"
|
||||
end
|
||||
|
||||
it do
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user