From f11194a4637223c64c7b588bcdb66484a7cbc669 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 21 Oct 2018 17:50:02 +0200 Subject: [PATCH] Remove faulty set rabbitmq options These are set but those variables is not available in the init.pp class and was removed in [1]. [1] https://review.openstack.org/#/c/570311/ Change-Id: I774ef7e5ad7944573ae537fda72c2ab57584a018 --- manifests/api.pp | 6 ------ manifests/conductor.pp | 6 ------ manifests/taskmanager.pp | 6 ------ 3 files changed, 18 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index bab7841d..b7bb92e0 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -290,13 +290,7 @@ class trove::api( } 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, kombu_failover_strategy => $::trove::kombu_failover_strategy, diff --git a/manifests/conductor.pp b/manifests/conductor.pp index 5fafc9d4..79377046 100644 --- a/manifests/conductor.pp +++ b/manifests/conductor.pp @@ -137,13 +137,7 @@ class trove::conductor( } 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, kombu_failover_strategy => $::trove::kombu_failover_strategy, diff --git a/manifests/taskmanager.pp b/manifests/taskmanager.pp index de41fe4b..bf23dd76 100644 --- a/manifests/taskmanager.pp +++ b/manifests/taskmanager.pp @@ -201,13 +201,7 @@ the future release. Please use trove::default_neutron_networks instead.") } 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, kombu_failover_strategy => $::trove::kombu_failover_strategy,