Browse Source

Merge pull request #804 from sakshiarora13/devel

Issue #803: Fix for grafana pod failing
Sujit Jadhav 3 years ago
parent
commit
8c06fcd4a4

+ 1 - 1
control_plane/roles/webui_grafana/tasks/plugins.yml

@@ -20,7 +20,7 @@
     version: main
     version: main
 
 
 - name: Wait for grafana pod to come to ready state
 - name: Wait for grafana pod to come to ready state
-  command: kubectl wait --for=condition=ready --timeout=10m -n "{{ grafana_namespace }}" pod -l app="{{ grafana_k8s }}"
+  command: kubectl wait --for=condition=ready --timeout="{{ grafana_pod_timeout }}" -n "{{ grafana_namespace }}" pod -l app="{{ grafana_k8s }}"
   changed_when: false
   changed_when: false
   
   
 - name: Unzip plugins at grafana-plugins folder
 - name: Unzip plugins at grafana-plugins folder

+ 7 - 0
control_plane/roles/webui_grafana/tasks/pre-requisites.yml

@@ -17,6 +17,13 @@
   command: ansible-galaxy collection install "{{ item }}"
   command: ansible-galaxy collection install "{{ item }}"
   with_items: "{{ collections_name }}"
   with_items: "{{ collections_name }}"
   changed_when: false
   changed_when: false
+
+- name: Install PyYAML using pip3
+  pip:
+    name: PyYAML
+    state: present
+    executable: pip3
+    extra_args: --ignore-installed
   
   
 - name: Install openshift using pip3
 - name: Install openshift using pip3
   pip:
   pip:

+ 1 - 0
control_plane/roles/webui_grafana/vars/main.yml

@@ -36,6 +36,7 @@ grafana_http_port: 5000
 grafana_plugins_names: "hpcviz-idvl-hpcc-sankey,hpcviz-idvl-hpcc-parallel-coordinate,hpcviz-idvl-hpcc-spiral-layout,hpcviz-idvl-hpcc-stream-net"
 grafana_plugins_names: "hpcviz-idvl-hpcc-sankey,hpcviz-idvl-hpcc-parallel-coordinate,hpcviz-idvl-hpcc-spiral-layout,hpcviz-idvl-hpcc-stream-net"
 
 
 # Usage: plugins.yml
 # Usage: plugins.yml
+grafana_pod_timeout: 30m
 plugins_name:
 plugins_name:
   - parallel-coordinate.zip
   - parallel-coordinate.zip
   - sankey.zip
   - sankey.zip