Run OVN playbook without limit during upgrade

Author: Alex-Welsh

etc/kayobe/ansible/ovn-fix-chassis-priorities.yml

@@ -21,22 +21,25 @@
 - name: Find OVN DB DB Leader
   hosts: "{{ ovn_nb_db_group | default('controllers') }}"
   tasks:
-    - name: Find the OVN NB DB leader
-      ansible.builtin.command: docker exec ovn_nb_db ovn-nbctl get-connection
-      changed_when: false
-      failed_when: false
-      register: ovn_check_result
-      check_mode: false
+    - name: Find OVN DB Leader
+      when: kolla_enable_ovn
+      block:
+        - name: Find the OVN NB DB leader
+          ansible.builtin.command: docker exec ovn_nb_db ovn-nbctl get-connection
+          changed_when: false
+          failed_when: false
+          register: ovn_check_result
+          check_mode: false
 
-    - name: Group hosts by leader/follower role
-      ansible.builtin.group_by:
-        key: "ovn_nb_{{ 'leader' if ovn_check_result.rc == 0 else 'follower' }}"
-      changed_when: false
+        - name: Group hosts by leader/follower role
+          ansible.builtin.group_by:
+            key: "ovn_nb_{{ 'leader' if ovn_check_result.rc == 0 else 'follower' }}"
+          changed_when: false
 
-    - name: Assert one leader exists
-      ansible.builtin.assert:
-        that:
-          - groups['ovn_nb_leader'] | default([]) | length == 1
+        - name: Assert one leader exists
+          ansible.builtin.assert:
+            that:
+              - groups['ovn_nb_leader'] | default([]) | length == 1
 
 - name: Fix OVN chassis priorities
   hosts: ovn_nb_leader
@@ -46,28 +49,31 @@
     ha_chassis_max_priority: 32767
     gateway_chassis_max_priority: "{{ ovn_nb_db_hosts_sorted | length }}"
   tasks:
-    - name: Fix ha_chassis priorities
-      ansible.builtin.command: >-
-        docker exec ovn_nb_db
-        bash -c '
-        ovn-nbctl find ha_chassis chassis_name={{ item }} |
-        awk '\''$1 == "_uuid" { print $3 }'\'' |
-        while read uuid; do ovn-nbctl set ha_chassis $uuid priority={{ priority }}; done'
-      loop: "{{ ovn_nb_db_hosts_sorted }}"
-      vars:
-        priority: "{{ ha_chassis_max_priority | int - ovn_nb_db_hosts_sorted.index(item) }}"
-      register: ha_chassis_command
-      changed_when: ha_chassis_command.rc == 0
+    - name: Fix OVN chassis priorities
+      when: kolla_enable_ovn
+      block:
+        - name: Fix ha_chassis priorities
+          ansible.builtin.command: >-
+            docker exec ovn_nb_db
+            bash -c '
+            ovn-nbctl find ha_chassis chassis_name={{ item }} |
+            awk '\''$1 == "_uuid" { print $3 }'\'' |
+            while read uuid; do ovn-nbctl set ha_chassis $uuid priority={{ priority }}; done'
+          loop: "{{ ovn_nb_db_hosts_sorted }}"
+          vars:
+            priority: "{{ ha_chassis_max_priority | int - ovn_nb_db_hosts_sorted.index(item) }}"
+          register: ha_chassis_command
+          changed_when: ha_chassis_command.rc == 0
 
-    - name: Fix gateway_chassis priorities
-      ansible.builtin.command: >-
-        docker exec ovn_nb_db
-        bash -c '
-        ovn-nbctl find gateway_chassis chassis_name={{ item }} |
-        awk '\''$1 == "_uuid" { print $3 }'\'' |
-        while read uuid; do ovn-nbctl set gateway_chassis $uuid priority={{ priority }}; done'
-      loop: "{{ ovn_nb_db_hosts_sorted }}"
-      vars:
-        priority: "{{ gateway_chassis_max_priority | int - ovn_nb_db_hosts_sorted.index(item) }}"
-      register: gateway_chassis_command
-      changed_when: gateway_chassis_command.rc == 0
+        - name: Fix gateway_chassis priorities
+          ansible.builtin.command: >-
+            docker exec ovn_nb_db
+            bash -c '
+            ovn-nbctl find gateway_chassis chassis_name={{ item }} |
+            awk '\''$1 == "_uuid" { print $3 }'\'' |
+            while read uuid; do ovn-nbctl set gateway_chassis $uuid priority={{ priority }}; done'
+          loop: "{{ ovn_nb_db_hosts_sorted }}"
+          vars:
+            priority: "{{ gateway_chassis_max_priority | int - ovn_nb_db_hosts_sorted.index(item) }}"
+          register: gateway_chassis_command
+          changed_when: gateway_chassis_command.rc == 0

etc/kayobe/ansible/ubuntu-upgrade.yml

@@ -104,7 +104,3 @@
         that:
           - ansible_facts.distribution_major_version == '22'
           - ansible_facts.distribution_release == 'jammy'
-
-- name: Run the OVN chassis priority fix playbook
-  import_playbook: "{{ lookup('ansible.builtin.env', 'KAYOBE_CONFIG_PATH') }}/ansible/ovn-fix-chassis-priorities.yml"
-  when: kolla_enable_ovn

tools/ubuntu-upgrade-overcloud.sh

@@ -31,4 +31,6 @@ set -x
 
 kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ubuntu-upgrade.yml -e os_release=jammy --limit $1
 
+kayobe playbook run $KAYOBE_CONFIG_PATH/ansible/ovn-fix-chassis-priorities.yml
+
 kayobe overcloud host configure --limit $1 --kolla-limit $1 -e os_release=jammy