Browse Source

Merge "Remove HostPrepConfig" into stable/rocky

tags/9.4.1
Zuul 1 month ago
parent
commit
683d4bf859

+ 5
- 40
common/deploy-steps.j2 View File

@@ -206,7 +206,6 @@ resources:
206 206
     depends_on:
207 207
     {%- if step == 1 %}
208 208
     {%- for dep in enabled_roles %}
209
-      - {{dep.name}}PreConfig
210 209
       - {{dep.name}}ArtifactsDeploy
211 210
     {%- endfor %}
212 211
     {%- else %}
@@ -276,7 +275,7 @@ resources:
276 275
           expression: switch($.data = {} => "no_bootstrap_server", $.data != {} => $.data.items().orderBy($[0]).first()[1])
277 276
           data: {get_param: [servers, {{primary_role_name}}]}
278 277
 
279
-# Artifacts config and HostPrepConfig is done on all roles, not only
278
+# Artifacts config is done on all roles, not only
280 279
 # enabled_roles, because on upgrade we need to write the json files
281 280
 # for the operator driven upgrade scripts (the ansible steps consume them)
282 281
 {% for role in roles %}
@@ -291,47 +290,10 @@ resources:
291 290
       servers:  {get_param: [servers, {{role.name}}]}
292 291
       config: {get_resource: {{role.name}}ArtifactsConfig}
293 292
 
294
-  {{role.name}}HostPrepConfig:
295
-    type: OS::Heat::SoftwareConfig
296
-    properties:
297
-      group: ansible
298
-      options:
299
-        modulepath: /usr/share/ansible-modules
300
-      config:
301
-        str_replace:
302
-          template: _PLAYBOOK
303
-          params:
304
-            _PLAYBOOK:
305
-              - hosts: localhost
306
-                connection: local
307
-                vars:
308
-                  docker_puppet_script: {get_file: ../docker/docker-puppet.py}
309
-                  bootstrap_server_id: {get_attr: [BootstrapServerId, value]}
310
-                tasks:
311
-                  # FIXME: can we move docker-puppet somewhere so it's installed via a package?
312
-                  - name: Create /var/lib/docker-puppet
313
-                    file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
314
-                  - name: Write docker-puppet.py
315
-                    copy: content="{{ '{{' }}docker_puppet_script{{ '}}' }}" dest=/var/lib/docker-puppet/docker-puppet.py force=yes mode=0600
316
-
317
-  {{role.name}}HostPrepDeployment:
318
-    type: OS::Heat::SoftwareDeploymentGroup
319
-    properties:
320
-      name: {{role.name}}HostPrepDeployment
321
-      servers: {get_param: [servers, {{role.name}}]}
322
-      config: {get_resource: {{role.name}}HostPrepConfig}
323 293
 {% endfor %}
324 294
 
325 295
   # BEGIN CONFIG STEPS, only on enabled_roles
326 296
 {%- for role in enabled_roles %}
327
-  {{role.name}}PreConfig:
328
-    type: OS::TripleO::Tasks::{{role.name}}PreConfig
329
-    depends_on: {{role.name}}HostPrepDeployment
330
-    properties:
331
-      servers: {get_param: [servers, {{role.name}}]}
332
-      input_values:
333
-        update_identifier: {get_param: DeployIdentifier}
334
-
335 297
   # Deployment steps for {{role.name}}
336 298
   # A single config is re-applied with an incrementing step number
337 299
   {% for step in range(1, deploy_steps_max) %}
@@ -346,7 +308,6 @@ resources:
346 308
     # is fixed.
347 309
     {%- if step == 1 %}
348 310
     {%- for dep in enabled_roles %}
349
-      - {{dep.name}}PreConfig
350 311
       - {{dep.name}}ArtifactsDeploy
351 312
     {%- endfor %}
352 313
     {%- else %}
@@ -468,6 +429,10 @@ outputs:
468 429
                 bootstrap_server_id: BOOTSTRAP_SERVER_ID
469 430
                 step: 0
470 431
               tasks:
432
+                - name: Create /var/lib/docker-puppet
433
+                  file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
434
+                - name: Write docker-puppet.py
435
+                  copy: src=docker_puppet_script.yaml dest=/var/lib/docker-puppet/docker-puppet.py force=yes mode=0600
471 436
 {%- for role in roles %}
472 437
                 - import_tasks: {{role.name}}/deploy_steps_tasks.yaml
473 438
                   when: tripleo_role_name == '{{role.name}}'

+ 6
- 0
releasenotes/notes/host_prep_config_removal-f579718021db5385.yaml View File

@@ -0,0 +1,6 @@
1
+---
2
+other:
3
+  - |
4
+    HostPrepConfig has been removed. The resource isn't used anymore. It was
5
+    using the old fashion to run Ansible via Heat, which we don't need anymore
6
+    with config-download by default in Rocky.

Loading…
Cancel
Save