aboutsummaryrefslogtreecommitdiffstats
path: root/puppet/all-nodes-config.yaml
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-05-07 13:05:13 -0400
committerGiulio Fidente <gfidente@redhat.com>2015-05-19 07:09:28 -0400
commit7e96bb748561cfd13bae9f048ebbbf7a0f631fd1 (patch)
tree211d5b51e6b5edd3a3d23158b51fb3c0ff91fa3c /puppet/all-nodes-config.yaml
parente4165af938510ff1352b9657e1e3942f1803e0a7 (diff)
Provide RabbitMQ clients with a list of servers instead of VIP
This will change the way how RabbitMQ clients get to the servers, they will not go through HAProxy anymore. Change-Id: I522d7520b383a280505e0e7c8fecba9ac02d2c9b
Diffstat (limited to 'puppet/all-nodes-config.yaml')
-rw-r--r--puppet/all-nodes-config.yaml19
1 files changed, 15 insertions, 4 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml
index c6dcaec..ec7fa7f 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: