Browse Source

Merge "Exclude /var/lib/ironic/* from container-puppet.sh rsync" into stable/train

changes/11/719011/1
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
a88357c8a4
4 changed files with 44 additions and 1 deletions
  1. +1
    -1
      common/container-puppet.sh
  2. +14
    -0
      deployment/ironic/ironic-conductor-container-puppet.yaml
  3. +14
    -0
      deployment/ironic/ironic-inspector-container-puppet.yaml
  4. +15
    -0
      releasenotes/notes/ironic_cleanup_config_data-1d4ae909c0869a90.yaml

+ 1
- 1
common/container-puppet.sh View File

@@ -72,7 +72,7 @@ verbosity=""

# Disables archiving
if [ -z "$NO_ARCHIVE" ]; then
archivedirs=("/etc" "/root" "/opt" "/var/lib/ironic/tftpboot" "/var/lib/ironic/httpboot" "/var/www" "/var/spool/cron" "/var/lib/nova/.ssh")
archivedirs=("/etc" "/root" "/opt" "/var/www" "/var/spool/cron" "/var/lib/nova/.ssh")
rsync_srcs=""
for d in "${archivedirs[@]}"; do
if [ -d "$d" ]; then


+ 14
- 0
deployment/ironic/ironic-conductor-container-puppet.yaml View File

@@ -584,6 +584,20 @@ outputs:
with_items:
- httpboot
- tftpboot
# 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
fast_forward_upgrade_tasks:
- when:
- step|int == 0


+ 14
- 0
deployment/ironic/ironic-inspector-container-puppet.yaml View File

@@ -480,3 +480,17 @@ outputs:
path: /var/lib/ironic-inspector/dhcp-hostsdir
state: directory
setype: svirt_sandbox_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

+ 15
- 0
releasenotes/notes/ironic_cleanup_config_data-1d4ae909c0869a90.yaml View File

@@ -0,0 +1,15 @@
---
upgrade:
- |
Exclude /var/lib/ironic/* from container-puppet.sh rsync, this is a
leftover from the initial containerization of TripleO; now we have
host prep tasks, the ironic conductor and inspector bind mount
/var/lib/ironic and generate the data that they need. But this data should
not be in the config volume or it can conflict from each other when rsync
runs at the same time. Check `launchpad bug 1868934
<https://bugs.launchpad.net/tripleo/+bug/1868934>`_.
TripleO upgrade tasks and host prep tasks will take care of removing
the var directory from the config volumes and the containers will just use
the bind mount, like it should be doing now.
These tasks will run during a minor update, major upgrade, and fast
forward upgrade.

Loading…
Cancel
Save