Merge "Improve ceph services discovery."

tasks/common/auxilary-facts.yaml

@@ -62,15 +62,19 @@
     roles_data: "{{ (roles_data_file.stdout) | ternary(roles_data, default_roles_data) }}"
     custom_roles_used: "{{ (roles_data_file.stdout) | ternary(true, false) }}"
 
-- name: assert CephOSD is enabled
+- name: get Enabled services for each role
   shell: |
     source {{ undercloud_rc }}
-    openstack stack output show -f yaml {{ overcloud_stack_name }} EnabledServices | awk '/\s+- ceph_osd/'
-  register: ceph_osd_service
+    openstack stack output show -f yaml {{ overcloud_stack_name }} EnabledServices -c output_value
+  register: enabled_services_out
+
+- name: set enabled_services fact
+  set_fact:
+    enabled_services: "{{ dict(enabled_services_out.stdout|from_yaml).output_value }}"
 
 - name: set ceph_osd_enabled fact
   set_fact:
-    ceph_osd_enabled: "{{ (ceph_osd_service.stdout) | ternary(true, false) }}"
+    ceph_osd_enabled: "{{  enabled_services.values() | list | flatten | intersect(['ceph_osd','ceph_mgr','ceph_mon']) | length > 0 | bool }}"
 
 - name: check if bm nodes are present
   shell: |

templates/overcloud_system_upgrade.sh.j2

@@ -43,6 +43,18 @@ echo "[$(date)] Finished system upgrade run for {{ item }} role"
 
 {% endif -%}
 
+{% if enabled_services[role]|intersect(['ceph_osd','ceph_mon','ceph_mgr'])|length > 0 -%}
+
+echo "[$(date)] Started ceph systemd units migration run for {{ item }} role"
+
+openstack overcloud external-upgrade run \
+        --tags ceph_systemd \
+        -e ceph_ansible_limit={{ item }} 2>&1
+
+echo "[$(date)] Finished ceph systemd units migration run for {{ item }} role"
+
+{% endif -%}
+
 {% if role == 'Controller' and role_hosts|length > 1 and role_hosts.index(item) == 0 -%}
 
 echo "[$(date)] Started system upgrade transfer data for {{ item }} role"