Merge "Use Ansible for bootstrap_node hieradata"

common/deploy-steps.j2

@@ -128,6 +128,9 @@ parameters:
   {{role.name}}PerHostHieradata:
     type: json
     default: {}
+  {{role.name}}HieradataVars:
+    type: json
+    default: {}
 {%- endfor %}
   ValidateControllersIcmp:
     default: true
@@ -434,6 +437,26 @@ outputs:
                 - overcloud
                 - pre_deploy_steps
 
+{%- for role in roles %}
+            - hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
+              name: Server hieradata from vars
+              gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
+              vars_files:
+                - {{role.name}}/hieradata_vars.yaml
+              tasks:
+                - name: Hieradata from vars
+                  include_role:
+                    name: tripleo-hieradata
+                    tasks_from: hieradata_vars.yaml
+                  vars:
+                    hieradata_templates_list:
+                      - bootstrap_node
+                  when: tripleo_role_name == '{{role.name}}'
+              tags:
+                - overcloud
+                - pre_deploy_steps
+{%- endfor %}
+
             - hosts: {{primary_role_name}}:DEPLOY_TARGET_HOST
               name: Server deployments
               gather_facts: {{ '"{{' }} gather_facts | default(false) {{ '}}"' }}
@@ -687,6 +710,7 @@ outputs:
       {{role.name}}/deployment-hieradata.j2.yaml: {get_param: {{role.name}}DeploymentHieradata}
       {{role.name}}/deployment-hierarchy.yaml: {get_param: {{role.name}}DeploymentHierarchy}
       {{role.name}}/per-host-hieradata.j2.yaml: {get_param: {{role.name}}PerHostHieradata}
+      {{role.name}}/hieradata_vars: {get_param: {{role.name}}HieradataVars}
 {%- endfor %}
       update_steps_tasks: |
 {%- for role in roles %}

overcloud.j2.yaml

@@ -753,6 +753,16 @@ resources:
             - {get_attr: [HostsValue, value]}
 
 {%- for outer_role in roles %}
+
+  {{outer_role.name}}HieradataVars:
+    type: OS::Heat::Value
+    properties:
+      value:
+        bootstrap_nodeid:
+          yaql:
+            expression: coalesce($.data, []).first(null)
+            data: {get_attr: [{{outer_role.name}}, hostname]}
+
   {{outer_role.name}}allNodesConfig:
     type: OS::TripleO::AllNodes::SoftwareConfig
     properties:
@@ -821,10 +831,6 @@ resources:
       ServiceNetMap: {get_attr: [ServiceNetMap, service_net_map_lower]}
       DeployIdentifier: {get_param: DeployIdentifier}
       UpdateIdentifier: {get_param: UpdateIdentifier}
-      bootstrap_nodeid:
-        yaql:
-          expression: coalesce($.data, []).first(null)
-          data: {get_attr: [{{outer_role.name}}, hostname]}
 {%- endfor %}
 
   GlobalConfig:
@@ -1085,6 +1091,9 @@ resources:
     {%- endfor %}
 {%- endfor %}
       HostsEntry: {get_attr: [HostsEntryValue, value]}
+{%- for role in roles %}
+      {{role.name}}HieradataVars: {get_attr: [{{role.name}}HieradataVars, value]}
+{%- endfor %}
 
   DeployedServerEnvironment:
     type: OS::TripleO::DeployedServerEnvironment

puppet/all-nodes-config.j2.yaml

@@ -82,9 +82,6 @@ parameters:
     description: CLI tool used to manage containers.
     constraints:
       - allowed_values: ['docker', 'podman']
-  bootstrap_nodeid:
-    type: string
-    default: ''
 
 resources:
 
@@ -163,8 +160,6 @@ resources:
     properties:
       value:
         datafiles:
-          bootstrap_node:
-            bootstrap_nodeid: {get_param: bootstrap_nodeid}
           all_nodes: {get_attr: [allNodesConfigValue, value]}
           vip_data:
             map_merge: