summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorJiri Stransky <jistr@redhat.com>2015-03-25 14:30:01 +0100
committerJiri Stransky <jistr@redhat.com>2015-03-25 14:36:11 +0100
commit5ddcfb66554a00e405351fee770892d219123b31 (patch)
tree5892e603f7bfe3ae93fd2f55b23027de0924f037 /puppet
parentfed9d001ccc92a6d3392cb959416596b6df83d99 (diff)
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
Diffstat (limited to 'puppet')
-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
}