Browse Source

Do not ignore Swift ring changes to trigger container restart

Swift containers need to restart if the rings change. In
non-containerized environments this is not required, because the Swift
processes will reload the rings on any changes. However, this does not
work within containers, thus a restart is required.

This also restarts swift_copy_rings and swift_setup_srv container. This
will copy the updated ring files and ensure new storage mount points are
using the right permissions.

Closes-Bug: 1802066
Related-Bug: 1786065
Change-Id: Ie2b9f003dc34f2f02a45293d06d6a40c8d5ed8ff
tags/10.4.0
Christian Schwede 7 months ago
parent
commit
b49629f085
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      docker/docker-puppet.py

+ 3
- 3
docker/docker-puppet.py View File

@@ -362,10 +362,10 @@ if not os.path.exists(sh_script):
362 362
                     excluded_original_passwords+=" --exclude=/var/lib/config-data/*${p}"
363 363
                 fi
364 364
             done
365
-
366
-            # We need to exclude the swift rings and their backup as those change over time and
365
+            # We need to exclude the swift ring backups as those change over time and
367 366
             # containers do not need to restart if they change
368
-            EXCLUDE=--exclude='*/etc/swift/backups/*'\ --exclude='*/etc/swift/*.ring.gz'\ --exclude='*/etc/swift/*.builder'\ --exclude='*/etc/libvirt/passwd.db'\ ${excluded_original_passwords}
367
+            EXCLUDE=--exclude='*/etc/swift/backups/*'\ --exclude='*/etc/libvirt/passwd.db'\ ${excluded_original_passwords}
368
+
369 369
             # We need to repipe the tar command through 'tar xO' to force text
370 370
             # output because otherwise the sed command cannot work. The sed is
371 371
             # needed because puppet puts timestamps as comments in cron and

Loading…
Cancel
Save