summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-04-06 05:23:38 +0000
committerGerrit Code Review <review@openstack.org>2015-04-06 05:23:38 +0000
commit0c14b2ad3e0114ffa0aa9514cdfe3dd9d9d212a8 (patch)
treefc99680e15cc0d7e282c2ca2843ba3e27ef2729b
parent14e1423f9369fb38adcfaf5ab1f1fcff7a4b94cd (diff)
parent03d5b1281c866b599e78cc1938ccc24618d3643f (diff)
Merge "Remove enforced deps on RabbitMQ resources before config"
-rw-r--r--puppet/manifests/overcloud_controller.pp4
1 files changed, 0 insertions, 4 deletions
diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp
index 08f06a98..2b637b37 100644
--- a/puppet/manifests/overcloud_controller.pp
+++ b/puppet/manifests/overcloud_controller.pp
@@ -109,10 +109,6 @@ if hiera('step') >= 2 {
allowed_hosts => $allowed_hosts,
}
- Class['rabbitmq'] -> Rabbitmq_vhost <| |>
- Class['rabbitmq'] -> Rabbitmq_user <| |>
- Class['rabbitmq'] -> Rabbitmq_user_permissions <| |>
-
$rabbit_nodes = split(downcase(hiera('rabbit_node_names', $::hostname)), ',')
if count($rabbit_nodes) > 1 {
$rabbit_cluster = true