diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-03-31 12:48:23 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-03-31 12:48:23 +0000 |
| commit | 431b65a32fd0880bb14ddaf07e2f53ac42f10dad (patch) | |
| tree | 9fb43f973c4eba1b3cafa905c4576f82eb16ec54 | |
| parent | d7237747abe853c85643024624664f987e08c165 (diff) | |
| parent | 5ddcfb66554a00e405351fee770892d219123b31 (diff) | |
Merge "Refactor allNodesConfig"
| -rw-r--r-- | puppet/all-nodes-config.yaml | 4 | ||||
| -rw-r--r-- | puppet/controller-puppet.yaml | 2 | ||||
| -rw-r--r-- | puppet/manifests/overcloud_controller.pp | 2 |
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 b1e5ad1f..c27c48d1 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 } |