diff --git a/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp b/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp index 9a1641c9c..34a418e07 100644 --- a/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp +++ b/packstack/puppet/modules/packstack/manifests/trove/rabbitmq.pp @@ -25,12 +25,11 @@ class packstack::trove::rabbitmq () Service<| name == 'rabbitmq-server' |> -> Service<| tag == 'trove-service' |> class { 'trove': - 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", - use_neutron => hiera('CONFIG_NEUTRON_INSTALL'), - kombu_ssl_ca_certs => $kombu_ssl_ca_certs, - kombu_ssl_keyfile => $kombu_ssl_keyfile, - kombu_ssl_certfile => $kombu_ssl_certfile, + 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", + kombu_ssl_ca_certs => $kombu_ssl_ca_certs, + kombu_ssl_keyfile => $kombu_ssl_keyfile, + kombu_ssl_certfile => $kombu_ssl_certfile, } }