diff options
| author |   Steven Hardy <shardy@redhat.com> | 2016-08-10 18:01:37 +0100 |
|---|---|---|
| committer | Steven Hardy <shardy@redhat.com> | 2016-08-11 11:53:37 +0100 |
| commit | e8683a863d8389d7f89f8841a9695aed7d65ee87 (patch) | |
| tree | c4d08e334bdddea1b68fc1d5e218b9cbe64a85f5 /puppet | |
| parent | dae7f72898dec10a53d724d989dd7083b60c40b5 (diff) | |
Align node_ips hiera keys with the service name.
To enable composable generation of this switch the key names
to align with the service_name of each service.
Note that this should depend on I423b544df174254ac511b906b0c570e701678022
and previously passed CI with that defined, but because we now run
gate validation jobs on puppet-tripleo it's impossible to land, so
this now contains both old and new hiera keys temporarily, which will
be removed when the puppet-tripleo patch lands.
Change-Id: I7febf28bf409e25e8e5961ab551b6d56bb11e0c6
Partially-Implements: blueprint custom-roles
Diffstat (limited to 'puppet')
| -rw-r--r-- | puppet/all-nodes-config.yaml | 34 |
1 files changed, 33 insertions, 1 deletions
diff --git a/puppet/all-nodes-config.yaml b/puppet/all-nodes-config.yaml index 793b17dd..6f13b74e 100644 --- a/puppet/all-nodes-config.yaml +++ b/puppet/all-nodes-config.yaml @@ -104,7 +104,7 @@ resources: list_join: - ',' - {get_param: controller_names} - rabbit_node_ips: &rabbit_nodes_array + rabbit_node_ips: str_replace: template: "['SERVERS_LIST']" params: @@ -112,6 +112,22 @@ resources: list_join: - "','" - {get_param: rabbit_node_ips} + rabbitmq_node_ips: &rabbit_nodes_array + str_replace: + template: "['SERVERS_LIST']" + params: + SERVERS_LIST: + list_join: + - "','" + - {get_param: rabbit_node_ips} + mongodb_node_ips: + str_replace: + template: "['SERVERS_LIST']" + params: + SERVERS_LIST: + list_join: + - "','" + - {get_param: mongo_node_ips} mongo_node_ips: str_replace: template: "['SERVERS_LIST']" @@ -128,6 +144,22 @@ resources: list_join: - "','" - {get_param: redis_node_ips} + memcached_node_ips: + str_replace: + template: "['SERVERS_LIST']" + params: + SERVERS_LIST: + list_join: + - "','" + - {get_param: memcache_node_ips} + memcached_node_ips_v6: + str_replace: + template: "['inet6:[SERVERS_LIST]']" + params: + SERVERS_LIST: + list_join: + - "]','inet6:[" + - {get_param: memcache_node_ips} memcache_node_ips: str_replace: template: "['SERVERS_LIST']" |