Merge "Update container-config-scripts/ folder content before update_tasks." into stable/train

common/common-container-config-scripts.yaml

@@ -0,0 +1,17 @@
+- name: Create /var/lib/container-config-scripts
+  become: true
+  file:
+    path: /var/lib/container-config-scripts
+    state: directory
+    setype: svirt_sandbox_file_t
+  tags:
+    - container_config_scripts
+
+- name: Write container config scripts
+  become: true
+  no_log: True
+  tripleo_container_config_scripts:
+    config_data: "{{ lookup('file', tripleo_role_name + '/container_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
+    config_dir: /var/lib/container-config-scripts
+  tags:
+    - container_config_scripts

common/deploy-steps-tasks-step-1.yaml

@@ -195,15 +195,6 @@
           tags:
             - container_config
 
-        - name: Create /var/lib/container-config-scripts
-          become: true
-          file:
-            path: /var/lib/container-config-scripts
-            state: directory
-            setype: svirt_sandbox_file_t
-          tags:
-            - container_config_scripts
-
         # The container config files
         # /var/lib/container-startup-configs.json is removed as we now write
         # per-step files instead
@@ -224,14 +215,7 @@
           tags:
             - container_startup_configs
 
-        - name: Write container config scripts
-          become: true
-          no_log: True
-          tripleo_container_config_scripts:
-            config_data: "{{ lookup('file', tripleo_role_name + '/container_config_scripts.yaml', errors='ignore') | default({}, True) | from_yaml }}"
-            config_dir: /var/lib/container-config-scripts
-          tags:
-            - container_config_scripts
+        - import_tasks: common_container_config_scripts.yaml
 
         # This file location is deprecated and the new location is now:
         # /var/lib/tripleo-config/container-startup-config/step_X/<container_name>.json

common/deploy-steps.j2

@@ -389,6 +389,7 @@ outputs:
         keystone_resources: {get_param: KeystoneResourcesConfigs}
       common_deploy_steps_playbooks: {get_file: deploy-steps-playbooks-common.yaml}
       common_deploy_steps_tasks: {get_file: deploy-steps-tasks.yaml}
+      common_container_config_scripts: {get_file: common-container-config-scripts.yaml}
       hiera_steps_tasks: {get_file: hiera-steps-tasks.yaml}
       deploy_steps_tasks_step_0: {get_file: deploy-steps-tasks-step-0.yaml}
       common_deploy_steps_tasks_step_1: {get_file: deploy-steps-tasks-step-1.yaml}
@@ -809,6 +810,7 @@ outputs:
                 tripleo_minor_update: true
               tasks:
                 - import_tasks: hiera_steps_tasks.yaml
+                - import_tasks: common_container_config_scripts.yaml
                 - include_tasks: update_steps_tasks.yaml
                   with_sequence: start=0 end={{update_steps_max-1}}
                   loop_control: