Merge branch 'dellhpc:devel' into awx_logo

roles/cluster_validation/tasks/main.yml

@@ -97,4 +97,3 @@
 
 - name: Fetch grafana credentials
   include_tasks: fetch_grafana_cred.yml
-  when: control_plane_status

roles/k8s_start_services/tasks/configure_nginx_prom_grafana.yml

@@ -73,7 +73,7 @@
     grafana_user: "{{ hostvars['127.0.0.1']['grafana_username'] }}"
     grafana_password: "{{ hostvars['127.0.0.1']['grafana_password'] }}"
     ds_type: prometheus
-    ds_url: "http://{{ ansible_default_ipv4.address }}"
+    ds_url: "http://{{ ansible_default_ipv4.address }}:{{ nginx_listen_port }}"
     access: direct
   delegate_to: localhost
   no_log: true

roles/k8s_start_services/templates/nginx.conf.j2

@@ -36,8 +36,8 @@ http {
     include /etc/nginx/conf.d/*.conf;
 
     server {
-        listen       80 default_server;
-        listen       [::]:80 default_server;
+        listen       3200 default_server;
+        listen       [::]:3200 default_server;
         server_name  server_ip;
         root         /usr/share/nginx/html;
 

roles/k8s_start_services/vars/main.yml

@@ -104,3 +104,5 @@ grafana_svc_ip: "{{ lookup('ini', 'ip section=grafana_svc file={{ role_path }}/f
 grafana_svc_port: "{{ lookup('ini', 'port section=grafana_svc file={{ role_path }}/files/grafana_svc_details.ini') }}"
 
 opensuse_os_name: "openSUSE Leap"
+
+nginx_listen_port: 3200

roles/slurm_exporter/tasks/configure_grafana.yml

@@ -13,6 +13,9 @@
 #  limitations under the License.
 ---
 
+- name: Include k8s_start_services variables
+  include_vars: ../../k8s_start_services/vars/main.yml
+
 - name: Create prometheus datasource in grafana
   community.grafana.grafana_datasource:
     name: "hpc-prometheus-{{ ansible_default_ipv4.address }}"
@@ -20,7 +23,7 @@
     grafana_user: "{{ hostvars['127.0.0.1']['grafana_username'] }}"
     grafana_password: "{{ hostvars['127.0.0.1']['grafana_password'] }}"
     ds_type: prometheus
-    ds_url: "http://{{ ansible_default_ipv4.address }}"
+    ds_url: "http://{{ ansible_default_ipv4.address }}:{{ nginx_listen_port }}"
     access: direct
   delegate_to: localhost
   no_log: true