Merge "container-puppet: remove deprecated directory & json files"

common/container-puppet.py

@@ -550,7 +550,9 @@ if __name__ == '__main__':
     # Update the startup configs with the config hash we generated above
     STARTUP_CONFIGS = os.environ.get(
         'STARTUP_CONFIG_PATTERN',
-        '/var/lib/tripleo-config/docker-container-startup-config-step_*.json'
+        '/var/lib/tripleo-config/'
+        'container-startup-config/'
+        'step_' + os.environ.get('STEP', '6') + '/*.json'
     )
     LOG.debug('STARTUP_CONFIG_PATTERN: %s' % STARTUP_CONFIGS)
     # Run infile processing

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

@@ -109,24 +109,6 @@
             - container_config
             - container_config_tasks
 
-        # For backward compatibility in Stein, so our operators have time
-        # to learn about the new directory.
-        - name: Create /var/lib/docker-puppet for backward compatibility
-          file:
-            path: /var/lib/docker-puppet
-            state: directory
-          tags:
-            - container_config
-            - container_config_tasks
-
-        - name: Deprecation file about /var/lib/docker-puppet
-          copy:
-            dest: /var/lib/docker-puppet/readme.txt
-            content: |
-              /var/lib/docker-puppet was moved under
-              /var/lib/container-puppet because we don't run Docker anymore.
-          ignore_errors: true
-
         - name: Delete existing /var/lib/container-puppet/check-mode for check mode
           file:
             path: /var/lib/container-puppet/check-mode
@@ -261,22 +243,6 @@
           tags:
             - container_startup_configs
 
-        # For backward compatibility, the files are still generated.
-        # However, container_puppet.py won't create their hashed version if
-        # config changed.
-        - name: Write per-step container startup configs for backward compatibility
-          no_log: True
-          copy:
-            content: "{{ item[1] | to_nice_json }}"
-            dest: /var/lib/tripleo-config/container-startup-config-{{ item[0] }}.json
-            force: yes
-            mode: '0600'
-          loop: "{{ container_config_with_default | dictsort }}"
-          loop_control:
-            label: "{{ item[0] }}"
-          tags:
-            - container_startup_configs
-
         - name: Generate startup configs files per step and per container
           no_log: True
           include_tasks: container_startup_configs_tasks.yaml

common/deploy-steps.j2

@@ -833,9 +833,9 @@ outputs:
                 docker_puppet_process_count: DOCKER_PUPPET_PROCESS_COUNT
                 docker_puppet_mount_host_puppet: DOCKER_PUPPET_MOUNT_HOST_PUPPET
               tasks:
-                - name: Check if /var/lib/tripleo-config/container-startup-config-1.json already exists
+                - name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists"
                   stat:
-                    path: /var/lib/tripleo-config/container-startup-config-1.json
+                    path: "/var/lib/tripleo-config/container-startup-config/step_{{step}}"
                   register: container_startup_configs_json_stat
                 - include_tasks: common_deploy_steps_tasks_step_1.yaml
                   when:
@@ -868,9 +868,9 @@ outputs:
                   run_once: true
                   debug:
                     msg: Use --start-at-task 'Overcloud common deploy step tasks {{step}}' to resume from this task
-                - name: Check if /var/lib/tripleo-config/container-startup-config-1.json already exists
+                - name: "Check if /var/lib/tripleo-config/container-startup-config/step_{{step}} already exists"
                   stat:
-                    path: /var/lib/tripleo-config/container-startup-config-1.json
+                    path: "/var/lib/tripleo-config/container-startup-config/step_{{step}}"
                   register: container_startup_configs_json_stat
                 - include_tasks: common_deploy_steps_tasks.yaml
                   when: (deploy_identifier is defined and deploy_identifier != "" and deploy_identifier is not none) or