Browse Source

Remove HostPrepConfig (for config-download)

HostPrepConfig was using the old way (Heat) to run Ansible. We don't
need it anymore when using config-download.

This is an equivalent backport of
I2041e6892de76b0ed04d7497e3f9064bfaf58270 (why the same change-id is
used here). That patch can not just be backported as-is to stable/queens
because the non-config-download mechanism still needs to work, so we can
not just remove the resources.

Instead, we provide a new mapping that is set to OS::Heat::None when
config-download is activated with the environment file.

Change-Id: I2041e6892de76b0ed04d7497e3f9064bfaf58270
tags/8.4.1
James Slagle 3 weeks ago
parent
commit
d12b5e75bb

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

@@ -285,7 +285,7 @@ resources:
285 285
                         copy: content="{{ '{{' }}docker_puppet_script{{ '}}' }}" dest=/var/lib/docker-puppet/docker-puppet.py force=yes mode=0600
286 286
 
287 287
   {{role.name}}HostPrepDeployment:
288
-    type: OS::Heat::SoftwareDeploymentGroup
288
+    type: OS::TripleO::HostPrepDeployment
289 289
     properties:
290 290
       name: {{role.name}}HostPrepDeployment
291 291
       servers: {get_param: [servers, {{role.name}}]}
@@ -449,6 +449,10 @@ outputs:
449 449
                 bootstrap_server_id: BOOTSTRAP_SERVER_ID
450 450
               become: true
451 451
               tasks:
452
+                - name: Create /var/lib/docker-puppet
453
+                  file: path=/var/lib/docker-puppet state=directory setype=svirt_sandbox_file_t selevel=s0 recurse=true
454
+                - name: Write docker-puppet.py
455
+                  copy: src=docker_puppet_script.yaml dest=/var/lib/docker-puppet/docker-puppet.py force=yes mode=0600
452 456
 {%- for role in roles %}
453 457
                 - include: {{role.name}}/host_prep_tasks.yaml
454 458
                   when: tripleo_role_name == '{{role.name}}'

+ 2
- 0
environments/config-download-environment.yaml View File

@@ -10,6 +10,8 @@ resource_registry:
10 10
   OS::TripleO::Ssh::KnownHostsDeployment: OS::Heat::None
11 11
   OS::TripleO::Ssh::HostPubKey: OS::Heat::None
12 12
 
13
+  OS::TripleO::HostPrepDeployment: OS::Heat::None
14
+
13 15
   # stable/queens fix to enable config-download for PreNetworkConfig
14 16
   OS::TripleO::Services::BootParams: ../extraconfig/pre_network/boot-params-service.yaml
15 17
   OS::TripleO::Reboot::SoftwareDeployment: OS::Heat::None

+ 1
- 0
overcloud-resource-registry-puppet.j2.yaml View File

@@ -4,6 +4,7 @@ resource_registry:
4 4
   OS::TripleO::PostDeploySteps: common/post.yaml
5 5
   OS::TripleO::AllNodes::SoftwareConfig: puppet/all-nodes-config.yaml
6 6
   OS::TripleO::AllNodesDeployment: OS::Heat::StructuredDeployments
7
+  OS::TripleO::HostPrepDeployment: OS::Heat::SoftwareDeploymentGroup
7 8
   OS::TripleO::Hosts::SoftwareConfig: hosts-config.yaml
8 9
   OS::TripleO::Ssh::HostPubKey: extraconfig/tasks/ssh/host_public_key.yaml
9 10
   OS::TripleO::Ssh::KnownHostsConfig: extraconfig/tasks/ssh/known_hosts_config.yaml

Loading…
Cancel
Save