Merge "[FFWD Ceph] Fix ceph post_upgrade_tasks for osd options" into stable/train

deployment/ceph-ansible/ceph-base.yaml

@@ -591,52 +591,7 @@ outputs:
           when:
             - step|int == 1
             - ansible_distribution_major_version == '8'
-
+      post_upgrade_tasks: []
-        - block:
-            - name: Check for docker cli
-              stat:
-                path: "/var/run/docker.sock"
-              register: check_docker_cli
-              check_mode: false
-            - name: Set noout flag
-              shell: "{{ container_client }} exec -u root ceph-mon-${HOSTNAME} ceph osd set {{ item }}"
-              become: true
-              with_items:
-                - noout
-                - norecover
-                - nobackfill
-                - norebalance
-                - nodeep-scrub
-              vars:
-                container_client: |-
-                  {% set container_client = 'podman' %}
-                  {%   if check_docker_cli.stat.exists|bool %}
-                  {%     set container_client = 'docker' %}
-                  {%   endif %}
-                  {{ container_client }}
-          delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
-          tags:
-            - never
-            - system_upgrade
-            - system_upgrade_prepare
-          when:
-            - step|int == 1
-            - upgrade_leapp_enabled
-      post_upgrade_tasks:
-        - name: Unset noout flag
-          shell: "{{ container_cli }} exec -u root ceph-mon-${HOSTNAME} ceph osd unset {{ item }}"
-          with_items:
-            - noout
-            - norecover
-            - nobackfill
-            - norebalance
-            - nodeep-scrub
-          when: step|int == 2
-          become: true
-          delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
-          tags:
-            - never
-            - system_upgrade
       puppet_config:
         config_image: ''
         config_volume: ''

deployment/ceph-ansible/ceph-mds.yaml

@@ -62,6 +62,7 @@ outputs:
     value:
       service_name: ceph_mds
       upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
+      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
       puppet_config:
         config_image: ''
         config_volume: ''

deployment/ceph-ansible/ceph-mon.yaml

@@ -70,6 +70,7 @@ outputs:
     value:
       service_name: ceph_mon
       upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
+      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
       puppet_config:
         config_image: ''
         config_volume: ''

deployment/ceph-ansible/ceph-osd.yaml

@@ -76,6 +76,51 @@ outputs:
             tags: validation
             when: step|int == 0
             shell: test "nil" == "$(hiera -c /etc/puppet/hiera.yaml ceph::profile::params::osds)"
+
+          - block:
+              - name: Check for docker cli
+                stat:
+                  path: "/var/run/docker.sock"
+                register: check_docker_cli
+                check_mode: false
+              - name: Set noout flag
+                shell: "{{ container_client }} exec -u root ceph-mon-${HOSTNAME} ceph osd set {{ item }}"
+                become: true
+                with_items:
+                  - noout
+                  - norecover
+                  - nobackfill
+                  - norebalance
+                  - nodeep-scrub
+                vars:
+                  container_client: |-
+                    {% set container_client = 'podman' %}
+                    {%   if check_docker_cli.stat.exists|bool %}
+                    {%     set container_client = 'docker' %}
+                    {%   endif %}
+                    {{ container_client }}
+            delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
+            tags:
+              - never
+              - system_upgrade
+              - system_upgrade_prepare
+            when:
+              - step|int == 1
+              - upgrade_leapp_enabled
+      post_upgrade_tasks:
+        list_concat:
+        - {get_attr: [CephBase, role_data, post_upgrade_tasks]}
+        - - name: Unset noout flag
+            shell: "{{ container_cli }} exec -u root ceph-mon-${HOSTNAME} ceph osd unset {{ item }}"
+            with_items:
+              - noout
+              - norecover
+              - nobackfill
+              - norebalance
+              - nodeep-scrub
+            when: step|int == 2
+            become: true
+            delegate_to: "{{ ceph_mon_short_bootstrap_node_name }}"
       puppet_config:
         config_image: ''
         config_volume: ''

deployment/ceph-ansible/ceph-rgw.yaml

@@ -121,6 +121,7 @@ outputs:
             - ResellerAdmin
             - swiftoperator
       upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}
+      post_upgrade_tasks: {get_attr: [CephBase, role_data, post_upgrade_tasks]}
       puppet_config:
         config_image: ''
         config_volume: ''