Remove unnecessary use of rpc_backend setting
rpc_backend setting is taken care by default_transport_url. puppet-* project are removing rabbit_params in [1], let's remove the usage from packstack. [1] https://review.openstack.org/#/q/topic:remove_rabbit_params Change-Id: Ic08cb1aa5284c127d290868bba72ebdc2c08fe4c
This commit is contained in:
parent
7c6e829d40
commit
d4e28f7e27
|
@ -36,7 +36,6 @@ class packstack::heat::rabbitmq ()
|
|||
|
||||
class { '::heat':
|
||||
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
|
||||
rpc_backend => 'rabbit',
|
||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
||||
debug => hiera('CONFIG_DEBUG_MODE'),
|
||||
|
|
|
@ -23,7 +23,6 @@ class packstack::ironic::rabbitmq ()
|
|||
}
|
||||
|
||||
class { '::ironic':
|
||||
rpc_backend => 'rabbit',
|
||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
||||
database_connection => "mysql+pymysql://ironic:${ironic_rabbitmq_cfg_ironic_db_pw}@${ironic_rabbitmq_cfg_mariadb_host}/ironic",
|
||||
|
|
|
@ -34,7 +34,6 @@ class packstack::sahara::rabbitmq ()
|
|||
identity_uri => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
|
||||
use_neutron => ($sahara_cfg_config_neutron_install == 'y'),
|
||||
host => hiera('CONFIG_SAHARA_HOST'),
|
||||
rpc_backend => 'rabbit',
|
||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
||||
kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
|
||||
|
|
|
@ -25,7 +25,6 @@ class packstack::trove::rabbitmq ()
|
|||
|
||||
|
||||
class { '::trove':
|
||||
rpc_backend => 'rabbit',
|
||||
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
|
||||
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
|
||||
database_connection => "mysql+pymysql://trove:${trove_rabmq_cfg_trove_db_pw}@${trove_rabmq_cfg_mariadb_host}/trove",
|
||||
|
|
Loading…
Reference in New Issue