Synchronise yoga with upstream

.zuul.d/project.yaml

@@ -3,7 +3,6 @@
     templates:
       - openstack-python3-yoga-jobs
       - openstack-python3-yoga-jobs-arm64
-      - check-requirements
       - publish-openstack-docs-pti
       - release-notes-jobs-python3
       - periodic-stable-jobs

docker/nova/nova-api/extend_start.sh

@@ -8,14 +8,14 @@
 # of the KOLLA_BOOTSTRAP variable being set, including empty.
 if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then
     nova-manage api_db sync
-    nova-manage db sync
+    nova-manage db sync --local_cell
     nova-manage db online_data_migrations
     exit 0
 fi
 
 if [[ "${!KOLLA_UPGRADE[@]}" ]]; then
     nova-manage api_db sync
-    nova-manage db sync
+    nova-manage db sync --local_cell
     exit 0
 fi
 

docker/nova/nova-compute/Dockerfile.j2

@@ -29,6 +29,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python3-oslo-vmware',
             'python3-rtslib',
             'qemu-kvm-block-rbd',
+            'rsync',
             'sysfsutils',
             'targetcli',
             'xfsprogs'
@@ -70,6 +71,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
             'python3-rbd',
             'python3-rtslib-fb',
             'qemu-block-extra',
+            'rsync',
             'sasl2-bin',
             'sysfsutils',
             'targetcli-fb',
@@ -112,6 +114,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'python3-rtslib',
             'qemu-img',
             'qemu-kvm-block-rbd',
+            'rsync',
             'sysfsutils',
             'targetcli',
             'xfsprogs'
@@ -152,6 +155,7 @@ RUN rm -f /etc/nova/nova-compute.conf
             'python3-rtslib-fb',
             'qemu-block-extra',
             'qemu-utils',
+            'rsync',
             'sasl2-bin',
             'sysfsutils',
             'targetcli-fb',

docker/swift/swift-base/Dockerfile.j2

@@ -58,14 +58,9 @@ RUN ln -s swift-base-source/* swift \
     && chown -R swift: /etc/swift /var/cache/swift /var/lock/swift
 {% endif %}
 
-COPY swift-rootwrap /var/lib/kolla/venv/bin/swift-rootwrap
-COPY rootwrap.conf /etc/swift/rootwrap.conf
 COPY swift_sudoers /etc/sudoers.d/kolla_swift_sudoers
 
-RUN chmod 755 /var/lib/kolla/venv/bin/swift-rootwrap \
-    && chmod 644 /etc/swift/rootwrap.conf \
-    && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/swift/rootwrap.conf \
-    && chmod 750 /etc/sudoers.d \
+RUN chmod 750 /etc/sudoers.d \
     && chmod 440 /etc/sudoers.d/kolla_swift_sudoers \
     && mkdir -p /opt/swift
 

docker/swift/swift-base/swift_sudoers

@@ -1,3 +1,2 @@
 swift ALL=(root) NOPASSWD: /bin/find /srv/node/ -maxdepth 1 -type d -execdir chown swift\:swift {} \\+
 swift ALL=(root) NOPASSWD: /usr/bin/find /srv/node/ -maxdepth 1 -type d -execdir chown swift\:swift {} \\+
-swift ALL=(root) NOPASSWD: /var/lib/kolla/venv/bin/swift-rootwrap /etc/swift/rootwrap.conf *

releasenotes/notes/nova-sync-local-cell-8e3258f4b410d25c.yaml

@@ -0,0 +1,7 @@
+---
+fixes:
+  - |
+    The Nova API container extended startup script has been updated to only
+    sync the local Nova cell. This resolves an error that would occur when the
+    Nova database password changes. More details can be found on `this bug
+    report <https://bugs.launchpad.net/kolla/+bug/2045558>`__.

requirements.txt

@@ -1,5 +1,5 @@
 pbr!=2.1.0,>=2.0.0 # Apache-2.0
-docker>=2.4.2 # Apache-2.0
+docker>=2.4.2,<7.0.0 # Apache-2.0
 Jinja2>=3.0.1 # BSD License (3 clause)
 GitPython>=1.0.1 # BSD License (3 clause)
 oslo.config>=5.1.0 # Apache-2.0