From 5ddcfb66554a00e405351fee770892d219123b31 Mon Sep 17 00:00:00 2001 From: Jiri Stransky Date: Wed, 25 Mar 2015 14:30:01 +0100 Subject: Refactor allNodesConfig * Create hiera file 'all_nodes' instead of 'rabbit' -- we'll want allNodesConfig to create keys for more services (e.g. mongo_node_ips) and it's not necessary to create a separate hiera file for each. * Rename rabbit_nodes to mongo_node_names -- we'll have more node lists, some services will need hostnames, some services will need IPs, some might need both, so we shouldn't have ambiguity in the hiera key names. Change-Id: If80f9c9b2849ae893e1ab78f1c4d246a2468665c --- puppet/manifests/overcloud_controller.pp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'puppet/manifests/overcloud_controller.pp') diff --git a/puppet/manifests/overcloud_controller.pp b/puppet/manifests/overcloud_controller.pp index 41363039..bad5fdb7 100644 --- a/puppet/manifests/overcloud_controller.pp +++ b/puppet/manifests/overcloud_controller.pp @@ -116,7 +116,7 @@ if hiera('step') >= 2 { Class['rabbitmq'] -> Rabbitmq_user <| |> Class['rabbitmq'] -> Rabbitmq_user_permissions <| |> - $rabbit_nodes = split(downcase(hiera('rabbit_nodes', $::hostname)), ',') + $rabbit_nodes = split(downcase(hiera('rabbit_node_names', $::hostname)), ',') if count($rabbit_nodes) > 1 { $rabbit_cluster = true } -- cgit 1.2.3-korg