Merge pull request #281 from stackhpc/upstream/zed-2024-06-03

Synchronise zed with upstream
stackhpc · Jun 3, 2024 · 81e37a3 · 81e37a3
2 parents bc351c1 + 73ceb77
commit 81e37a3
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 5 deletions.
diff --git a/ansible/roles/dell-switch/tasks/main.yml b/ansible/roles/dell-switch/tasks/main.yml
@@ -3,14 +3,14 @@
   local_action:
     module: dellos6_config
     provider: "{{ dell_switch_provider }}"
-    src: dellos6-config.j2
+    src: "{{ lookup('template', 'dellos6-config.j2') }}"
   when: dell_switch_type == 'dellos6'
 
 - name: Ensure DellOS9 switches are configured
   local_action:
     module: dellos9_config
     provider: "{{ dell_switch_provider }}"
-    src: dellos9-config.j2
+    src: "{{ lookup('template', 'dellos9-config.j2') }}"
   when: dell_switch_type == 'dellos9'
 
 - name: Ensure DellOS10 switches are configured

diff --git a/ansible/roles/docker-registry/tasks/destroy.yml b/ansible/roles/docker-registry/tasks/destroy.yml
@@ -14,7 +14,7 @@
   when: "'/' not in volume"
   failed_when:
     - volume_result.rc != 0
-    - "'No such volume' not in volume_result.stderr"
+    - "'no such volume' not in volume_result.stderr | lower"
   vars:
     volume: "{{ item.1.split(':')[0] }}"
   register: volume_result

diff --git a/ansible/roles/inspection-store/tasks/destroy.yml b/ansible/roles/inspection-store/tasks/destroy.yml
@@ -14,7 +14,7 @@
   when: "'/' not in volume"
   failed_when:
     - volume_result.rc != 0
-    - "'No such volume' not in volume_result.stderr"
+    - "'no such volume' not in volume_result.stderr | lower"
   vars:
     volume: "{{ item.1.split(':')[0] }}"
   register: volume_result

diff --git a/ansible/roles/opensm/tasks/destroy.yml b/ansible/roles/opensm/tasks/destroy.yml
@@ -14,7 +14,7 @@
   when: "'/' not in volume"
   failed_when:
     - volume_result.rc != 0
-    - "'No such volume' not in volume_result.stderr"
+    - "'no such volume' not in volume_result.stderr | lower"
   vars:
     volume: "{{ item.1.split(':')[0] }}"
   register: volume_result

diff --git a/releasenotes/notes/bug-2061102-cbc4c65c14c09d55.yaml b/releasenotes/notes/bug-2061102-cbc4c65c14c09d55.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue where Dell OS6 and Dell OS9 switch configuration was not
+    applied correctly. `LP#2061102
+    <https://bugs.launchpad.net/kayobe/+bug/2061102>`__.
diff --git a/releasenotes/notes/fix-issue-overcloud-service-destroy-volume-cleanup-4b54d81cde9831c7.yaml b/releasenotes/notes/fix-issue-overcloud-service-destroy-volume-cleanup-4b54d81cde9831c7.yaml
@@ -0,0 +1,6 @@
+---
+fixes:
+  - |
+    Fixes an issue with overcloud service destroy where it failed to remove the
+    inspection store docker volume. See `LP#2050092
+    <https://bugs.launchpad.net/kayobe/+bug/2050092>`__.