Merge pull request #247 from stackhpc/upstream/yoga-2024-02-15

Synchronise yoga with upstream

.gitreview

@@ -2,4 +2,4 @@
 host=review.opendev.org
 port=29418
 project=openstack/kayobe.git
-defaultbranch=stable/yoga
+defaultbranch=unmaintained/yoga

ansible/docker-devicemapper.yml

@@ -5,6 +5,18 @@
     - docker
     - docker-devicemapper
   tasks:
+    - name: Warn about deprecation of devicemapper Docker storage driver
+      fail:
+        msg: >
+          Support for using the devicemapper Docker storage driver is
+          deprecated in Kayobe and will be removed in the Caracal 16.0.0
+          release. To keep using devicemapper in the current release, ensure
+          that the version of Docker Engine installed is below 25.0.0.
+      # NOTE(priteau): We want this to print a nice big red warning and not to
+      # fail the run.
+      ignore_errors: yes
+      when: docker_storage_driver == 'devicemapper'
+
     - name: Check for existing Docker configuration using devicemapper
       block:
       - name: Query Docker daemon for storage driver

ansible/group_vars/all/openstack

@@ -5,9 +5,9 @@
 # Name of the current OpenStack release. Default is "yoga".
 openstack_release: "yoga"
 
-# Name of the current OpenStack branch. Default is "stable/yoga".
+# Name of the current OpenStack branch. Default is "unmaintained/yoga".
 openstack_branch: >-
-  {% if openstack_release != 'master' %}stable/{% endif %}{{ openstack_release | lower }}
+  {% if openstack_release != 'master' %}unmaintained/{% endif %}{{ openstack_release | lower }}
 
 ###############################################################################
 # OpenStack authentication configuration.

ansible/roles/network-redhat/tasks/main.yml

@@ -32,6 +32,15 @@
       value: unmanaged
   when:
     - ansible_facts.os_family == "RedHat" and ansible_facts.distribution_major_version == "9"
+  register: dns_config_task
+
+- name: Reload NetworkManager with DNS config
+  become: true
+  systemd:
+    name: NetworkManager
+    state: reloaded
+    daemon_reload: yes
+  when: dns_config_task is changed
 
 - name: Configure network interfaces (RedHat)
   import_role:

dev/functions

@@ -74,7 +74,7 @@ function config_defaults {
       if [[ "${BRANCH}" == "" ]]; then
         SERIES="master"
       else
-        SERIES="$(echo ${BRANCH} | sed 's|stable/||')"
+        SERIES="$(echo ${BRANCH} | sed -E 's,(stable|unmaintained)/,,')"
       fi
 
       # Upper constraints to use when installing Python packages.

etc/kayobe/openstack.yml

@@ -5,7 +5,7 @@
 # Name of the current OpenStack release. Default is "yoga".
 #openstack_release:
 
-# Name of the current OpenStack branch. Default is "stable/yoga".
+# Name of the current OpenStack branch. Default is "unmaintained/yoga".
 #openstack_branch:
 
 ###############################################################################

molecule-requirements.txt

@@ -6,6 +6,7 @@ ansible-lint>=3.0.0,<6.0.0,!=4.3.0 # MIT
 docker # Apache-2.0
 molecule<3.5.0 # MIT
 molecule-docker # MIT
+pytest<8 # MIT
 pytest-metadata<2 # MPL
 pytest-molecule # MIT
 pytest-testinfra

playbooks/kayobe-overcloud-host-configure-base/globals.yml.j2

@@ -0,0 +1,8 @@
+---
+# Pin Docker package to latest 24.x release before devicemapper was removed
+{% if ansible_facts.distribution_release == "jammy" %}
+docker_apt_package: "docker-ce=5:24.0.8-1~ubuntu.22.04~jammy"
+{% else %}
+docker_apt_package: "docker-ce=5:24.0.8-1~ubuntu.20.04~focal"
+{% endif %}
+docker_yum_package: "docker-ce-24*"

playbooks/kayobe-overcloud-host-configure-base/pre.yml

@@ -25,6 +25,11 @@
         src: overrides.yml.j2
         dest: "{{ kayobe_config_src_dir }}/etc/kayobe/zzz-overrides.yml"
 
+    - name: Ensure kolla-ansible globals.yml override config file exists
+      template:
+        src: globals.yml.j2
+        dest: "{{ kayobe_config_src_dir }}/etc/kayobe/kolla/globals.yml"
+
     # NOTE(mgoddard): Create two loopback devices backed by files. These will
     # be added to a software RAID volume, then added to an LVM volume group.
     - name: Ensure a docker storage backing file exists

releasenotes/notes/deprecate-docker-devicemapper-234447328a24094f.yaml

@@ -0,0 +1,8 @@
+---
+deprecations:
+  - |
+    Support for the ``devicemapper`` Docker storage driver is deprecated
+    following its removal from Docker Engine 25.0. Support will be fully
+    removed in the Caracal 16.0.0 release. Operators using ``devicemapper``
+    should ensure that a compatible version of Docker Engine is installed (i.e.
+    release 24.x or below).

requirements.txt

@@ -3,7 +3,7 @@ Jinja2>3 # BSD
 ansible>=4,<6.0 # GPLv3
 cliff>=3.1.0 # Apache
 importlib-metadata;python_version<'3.8' # Apache-2.0
-netaddr!=0.7.16,>=0.7.13 # BSD
+netaddr!=0.7.16,>=0.7.13,<1.0.0 # BSD
 PyYAML>=3.10.0 # MIT
 selinux # MIT
 # INI parsing

zuul.d/jobs.yaml

@@ -59,19 +59,11 @@
     required-projects:
       # Include kayobe to ensure other projects can use this job.
       - name: openstack/ansible-collection-kolla
-        # TODO(mgoddard): Remove when kayobe stable/yoga exists.
-        override-checkout: stable/yoga
       - name: openstack/kayobe
       - name: openstack/kayobe-config-dev
       - name: openstack/kolla
-        # TODO(mgoddard): Remove when kayobe stable/yoga exists.
-        override-checkout: stable/yoga
       - name: openstack/kolla-ansible
-        # TODO(mgoddard): Remove when kayobe stable/yoga exists.
-        override-checkout: stable/yoga
       - name: openstack/requirements
-        # TODO(mgoddard): Remove when kayobe stable/yoga exists.
-        override-checkout: stable/yoga
       - name: openstack/tenks
     irrelevant-files:
       - ^.*\.rst$