Merge "Refactor cellv2 host discovery logic to avoid races" into stable/pike

[apex-tripleo-heat-templates.git] / puppet / all-nodes-config.j2.yaml

diff --git a/puppet/all-nodes-config.j2.yaml b/puppet/all-nodes-config.j2.yaml
index bdd2bcf..6594962 100644 (file)
--- a/puppet/all-nodes-config.j2.yaml
+++ b/puppet/all-nodes-config.j2.yaml
@@ -22,6 +22,8 @@ parameters:
     type: json
   controller_names:
     type: comma_delimited_list
+  cellv2_discovery_hosts:
+    type: comma_delimited_list
   NetVipMap:
     type: json
   RedisVirtualIP:
@@ -141,6 +143,10 @@ resources:
                   list_join:
                   - ','
                   - {get_param: controller_names}
+              - cellv2_discovery_hosts:
+                  list_join:
+                  - ','
+                  - {get_param: cellv2_discovery_hosts}
                 deploy_identifier: {get_param: DeployIdentifier}
                 update_identifier: {get_param: UpdateIdentifier}
                 stack_action: {get_param: StackAction}