aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--puppet/all-nodes-config.yaml4
-rw-r--r--puppet/controller-puppet.yaml2
-rw-r--r--puppet/manifests/overcloud_controller.pp2
3 files changed, 4 insertions, 4 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index c5193e71..7fca449e 100644
--- a/puppet/all-nodes-config.yaml
+++ b/puppet/all-nodes-config.yaml
@@ -46,9 +46,9 @@ resources:
net.ipv4.tcp_keepalive_intvl: 1
hiera:
datafiles:
- rabbit:
+ all_nodes:
mapped_data:
- rabbit_nodes:
+ rabbit_node_names:
list_join:
- ','
- {get_param: controller_names}
diff --git a/puppet/controller-puppet.yaml b/puppet/controller-puppet.yaml
index 8b576bfe..a013fa15 100644
--- a/puppet/controller-puppet.yaml
+++ b/puppet/controller-puppet.yaml
@@ -599,10 +599,10 @@ resources:
- controller
- object
- swift_devices_and_proxy # provided by SwiftDevicesAndProxyConfig
- - rabbit # provided by allNodesConfig
- ceph_cluster # provided by CephClusterConfig
- ceph
- bootstrap_node # provided by BootstrapNodeConfig
+ - all_nodes # provided by allNodesConfig
- common
datafiles:
common:
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
}