Tidy up lingering todo's

A couple of lingering todo's here that can
now be removed. We don't need to cleanup
these directories anymore since we bind-mount
the correct directories into the container:
https://bugs.launchpad.net/tripleo/+bug/1868934

Related: https://bugs.launchpad.net/tripleo/+bug/1868934
Change-Id: If8f8745958157767ecebf30ec1e0fb7a7eb9bc5f
This commit is contained in:
Brendan Shephard 2021-08-03 00:31:35 +10:00
parent dadb112a50
commit f684a93aa9
2 changed files with 2 additions and 28 deletions

View File

@ -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

View File

@ -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