diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-20 14:51:19 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-20 14:51:19 +0000 |
| commit | f1df334e902867f2a81d8f46ee0f45a126b3516e (patch) | |
| tree | b4d45a3b385069623366991cff17309358f3b1e7 /puppet/all-nodes-config.yaml | |
| parent | 97b1e35b8f527d6971960f9526535557ce7d33bd (diff) | |
| parent | 7e96bb748561cfd13bae9f048ebbbf7a0f631fd1 (diff) | |
Merge "Provide RabbitMQ clients with a list of servers instead of VIP"
Diffstat (limited to 'puppet/all-nodes-config.yaml')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 19 |
1 files changed, 15 insertions, 4 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index c6dcaecb..ec7fa7fa 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -62,10 +62,14 @@ resources: list_join: - ',' - {get_param: controller_names} - rabbit_node_ips: - list_join: - - ',' - - {get_param: controller_ips} + rabbit_node_ips: &rabbit_nodes_array + str_replace: + template: "['SERVERS_LIST']" + params: + SERVERS_LIST: + list_join: + - "','" + - {get_param: controller_ips} mongo_node_ips: list_join: - ',' @@ -78,6 +82,13 @@ resources: list_join: - ',' - {get_param: controller_ips} + # NOTE(gfidente): interpolation with %{} in the + # hieradata file can't be used as it returns string + ceilometer::rabbit_hosts: *rabbit_nodes_array + cinder::rabbit_hosts: *rabbit_nodes_array + heat::rabbit_hosts: *rabbit_nodes_array + neutron::rabbit_hosts: *rabbit_nodes_array + nova::rabbit_hosts: *rabbit_nodes_array outputs: config_id: |