Merge pull request #246 from stackhpc/upstream/zed-2024-02-15

Synchronise zed with upstream
stackhpc · Feb 15, 2024 · fd130a3 · fd130a3
2 parents dbdacd8 + 4427530
commit fd130a3
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 6 deletions.
diff --git a/ansible/roles/network-redhat/tasks/main.yml b/ansible/roles/network-redhat/tasks/main.yml
@@ -19,6 +19,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:

diff --git a/dev/functions b/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.

diff --git a/playbooks/kayobe-base/pre.yml b/playbooks/kayobe-base/pre.yml
@@ -80,7 +80,7 @@
 
         - name: Ensure previous kayobe repository is cloned
           command: >-
-            git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b stable/{{ previous_release | lower }}
+            git clone {{ kayobe_src_dir }} {{ previous_kayobe_src_dir }} -b unmaintained/{{ previous_release | lower }}
 
         - name: Ensure previous kayobe-config directory exists
           file:
@@ -89,7 +89,7 @@
 
         - name: Ensure kayobe-config repository is cloned
           command: >-
-            git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b stable/{{ previous_release | lower }}
+            git clone {{ kayobe_config_src_dir }} {{ previous_kayobe_config_src_dir }} -b unmaintained/{{ previous_release | lower }}
 
         - name: Ensure previous kolla-ansible directory exists
           file:
@@ -98,7 +98,7 @@
 
         - name: Ensure previous kolla-ansible repository is cloned
           command: >-
-            git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b stable/{{ previous_release | lower }}
+            git clone {{ kolla_ansible_src_dir }} {{ previous_kolla_ansible_src_dir }} -b unmaintained/{{ previous_release | lower }}
 
         - name: Ensure previous kayobe is executed in verbose mode
           lineinfile:
@@ -111,14 +111,14 @@
             name: kayobe-galaxy-requirements
           vars:
             kayobe_galaxy_requirements_src_dir: "{{ previous_kayobe_src_dir }}"
-            kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
+            kayobe_galaxy_requirements_branch: "unmaintained/{{ previous_release | lower }}"
 
         - name: Update kolla-ansible requirements.yml
           include_role:
             name: kayobe-galaxy-requirements
           vars:
             kayobe_galaxy_requirements_src_dir: "{{ previous_kolla_ansible_src_dir }}"
-            kayobe_galaxy_requirements_branch: "stable/{{ previous_release | lower }}"
+            kayobe_galaxy_requirements_branch: "unmaintained/{{ previous_release | lower }}"
             kayobe_galaxy_requirements_dest_path: "/tmp/previous-kolla-ansible-requirements.yml"
 
       when: is_upgrade