Add installer phase for dashboard roles

This commits adds the support of the installer phase for dashboard,
grafana and node-exporter roles.

Signed-off-by: Dimitri Savineau <dsavinea@redhat.com>
(cherry picked from commit c7a5967a6fa60e3f0d81a03bc148834c3d4f9b59)

diff --git a/plugins/callback/installer_checkpoint.py b/plugins/callback/installer_checkpoint.py
index 0a76c0964b6a76a3bf22ef2c8e96ba59c81e3975..9c7cbc58ca7d7e2027187dba40dbcfdff48b31fa 100644 (file)
--- a/plugins/callback/installer_checkpoint.py
+++ b/plugins/callback/installer_checkpoint.py
@@ -31,6 +31,9 @@ class CallbackModule(CallbackBase):
             'installer_phase_ceph_client',
             'installer_phase_ceph_iscsi_gw',
             'installer_phase_ceph_rgw_loadbalancer',
+            'installer_phase_ceph_dashboard',
+            'installer_phase_ceph_grafana',
+            'installer_phase_ceph_node_exporter',
         ]
 
         # Define the attributes of the installer phases
@@ -75,6 +78,18 @@ class CallbackModule(CallbackBase):
                 'title': 'Install Ceph RGW LoadBalancer',
                 'playbook': 'roles/ceph-rgw-loadbalancer/tasks/main.yml'
             },
+            'installer_phase_ceph_dashboard': {
+                'title': 'Install Ceph Dashboard',
+                'playbook': 'roles/ceph-dashboard/tasks/main.yml'
+            },
+            'installer_phase_ceph_grafana': {
+                'title': 'Install Ceph Grafana',
+                'playbook': 'roles/ceph-grafana/tasks/main.yml'
+            },
+            'installer_phase_ceph_node_exporter': {
+                'title': 'Install Ceph Node Exporter',
+                'playbook': 'roles/ceph-node-exporter/tasks/main.yml'
+            },
         }
 
         # Find the longest phase title

diff --git a/site-container.yml.sample b/site-container.yml.sample
index bcecffa7ec2925b4cb221f9f9aa5df43b98af5fc..2ca39f6ca2c23172b50e8bd702a80d7f77c2506c 100644 (file)
--- a/site-container.yml.sample
+++ b/site-container.yml.sample
@@ -519,6 +519,15 @@
 
 - hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}'
   become: true
+  pre_tasks:
+    - name: set ceph grafana install 'In Progress'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_grafana:
+            status: "In Progress"
+            start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
   tasks:
     - block:
         - import_role:
@@ -544,8 +553,26 @@
             name: ceph-grafana
       when: dashboard_enabled | bool
 
+  post_tasks:
+    - name: set ceph grafana install 'Complete'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_grafana:
+            status: "Complete"
+            end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
 - hosts: '{{ groups["mgrs"][0] | default(groups["mons"][0]) | default(omit) }}'
   become: true
+  pre_tasks:
+    - name: set ceph dashboard install 'In Progress'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_dashboard:
+            status: "In Progress"
+            start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
   tasks:
     - block:
         - import_role:
@@ -554,3 +581,12 @@
         - import_role:
             name: ceph-dashboard
       when: dashboard_enabled | bool
+
+  post_tasks:
+    - name: set ceph dashboard install 'Complete'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_dashboard:
+            status: "Complete"
+            end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"

diff --git a/site.yml.sample b/site.yml.sample
index 38b14c36d66b547365bf8834cf246530e6aa5a05..da208e3fe5e5d01ab313839ac9fa8d7354a911f9 100644 (file)
--- a/site.yml.sample
+++ b/site.yml.sample
@@ -483,6 +483,15 @@
 
 - hosts: all
   become: true
+  pre_tasks:
+    - name: set ceph node exporter install 'In Progress'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_node_exporter:
+            status: "In Progress"
+            start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
   tasks:
     - block:
         - import_role:
@@ -497,8 +506,26 @@
             name: ceph-node-exporter
       when: dashboard_enabled | bool
 
+  post_tasks:
+    - name: set ceph node exporter install 'Complete'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_node_exporter:
+            status: "Complete"
+            end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
 - hosts: '{{ groups["grafana-server"][0] | default(groups["mgrs"][0]) | default(groups["mons"][0]) | default(omit) }}'
   become: true
+  pre_tasks:
+    - name: set ceph grafana install 'In Progress'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_grafana:
+            status: "In Progress"
+            start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
   tasks:
     - block:
         - import_role:
@@ -520,8 +547,26 @@
             name: ceph-grafana
       when: dashboard_enabled | bool
 
+  post_tasks:
+    - name: set ceph grafana install 'Complete'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_grafana:
+            status: "Complete"
+            end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
 - hosts: '{{ groups["mgrs"][0] | default(groups["mons"][0]) | default(omit) }}'
   become: true
+  pre_tasks:
+    - name: set ceph dashboard install 'In Progress'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_dashboard:
+            status: "In Progress"
+            start: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"
+
   tasks:
     - block:
         - import_role:
@@ -530,3 +575,12 @@
         - import_role:
             name: ceph-dashboard
       when: dashboard_enabled | bool
+
+  post_tasks:
+    - name: set ceph dashboard install 'Complete'
+      run_once: true
+      set_stats:
+        data:
+          installer_phase_ceph_dashboard:
+            status: "Complete"
+            end: "{{ lookup('pipe', 'date +%Y%m%d%H%M%SZ') }}"