diff --git a/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp index c9b954f6c..ca755bd90 100644 --- a/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp +++ b/packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp @@ -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'), diff --git a/packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp index c3e1d9423..6b56913cf 100644 --- a/packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp +++ b/packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp @@ -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", diff --git a/packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp index 8f6e7562f..5ca9102ec 100644 --- a/packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp +++ b/packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp @@ -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, diff --git a/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp index 2a02de8cb..5b812a790 100644 --- a/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp +++ b/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp @@ -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",