Merge "Tidy up lingering todo's"

deployment/ironic/ironic-conductor-container-puppet.yaml

@@ -700,20 +700,7 @@ outputs:
             - httpboot
             - tftpboot
             - images
-        # TODO(emilien): remove the cleanup tasks after Ussuri
-        # https://bugs.launchpad.net/tripleo/+bug/1868934
-        - name: Cleanup unnecessary container config-data
-          block: &ironic_config_data_cleanup
-            - name: Remove /var/lib/config-data/puppet-generated/ironic/var
-              file:
-                path: /var/lib/config-data/puppet-generated/ironic/var
-                state: absent
-      upgrade_tasks:
-        - name: Cleanup unnecessary container config-data
-          when:
-            - step|int == 0
-          tags: common
-          block: *ironic_config_data_cleanup
+      upgrade_tasks: []
       external_upgrade_tasks:
         - when:
             - step|int == 1

deployment/ironic/ironic-inspector-container-puppet.yaml

@@ -578,20 +578,7 @@ outputs:
             path: /var/lib/ironic-inspector/dhcp-hostsdir
             state: directory
             setype: container_file_t
-        # TODO(emilien): remove the cleanup tasks after Ussuri
-        # https://bugs.launchpad.net/tripleo/+bug/1868934
-        - name: Cleanup unnecessary container config-data
-          block: &ironic_config_data_cleanup
-            - name: Remove /var/lib/config-data/puppet-generated/ironic_inspector/var
-              file:
-                path: /var/lib/config-data/puppet-generated/ironic_inspector/var
-                state: absent
-      upgrade_tasks:
-        - name: Cleanup unnecessary container config-data
-          when:
-            - step|int == 0
-          tags: common
-          block: *ironic_config_data_cleanup
+      upgrade_tasks: []
       external_upgrade_tasks:
         - when:
             - step|int == 1