rename openshift_metrics to openshift_hosted_metrics

playbooks/common/openshift-cluster/openshift_hosted.yml

@@ -27,7 +27,7 @@
       logging_elasticsearch_ops_cluster_size: "{{ openshift_hosted_logging_elasticsearch_ops_cluster_size | default(1) }}"
   roles:
   - role: openshift_hosted
-  - role: openshift_metrics
+  - role: openshift_hosted_metrics
     when: openshift_hosted_metrics_deploy | default(false) | bool
   - role: openshift_hosted_logging
     when: openshift_hosted_logging_deploy | default(false) | bool

roles/openshift_metrics/README.md

@@ -40,7 +40,7 @@ Example Playbook
 - name: Configure openshift-metrics
   hosts: oo_first_master
   roles:
-  - role: openshift_metrics
+  - role: openshift_hosted_metrics
 ```
 
 License

roles/openshift_metrics/tasks/install.yml

@@ -3,7 +3,7 @@
 - name: Test if metrics-deployer service account exists
   command: >
     {{ openshift.common.client_binary }}
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace=openshift-infra
     get serviceaccount metrics-deployer -o json
   register: serviceaccount
@@ -14,7 +14,7 @@
   shell: >
     echo {{ metrics_deployer_sa | to_json | quote }} |
     {{ openshift.common.client_binary }}
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     create -f -
   when: serviceaccount.rc == 1
@@ -22,7 +22,7 @@
 - name: Test edit permissions
   command: >
     {{ openshift.common.client_binary }}
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     get rolebindings -o jsonpath='{.items[?(@.metadata.name == "edit")].userNames}'
   register: edit_rolebindings
@@ -31,7 +31,7 @@
 - name: Add edit permission to the openshift-infra project to metrics-deployer SA
   command: >
     {{ openshift.common.client_binary }} adm
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     policy add-role-to-user edit
     system:serviceaccount:openshift-infra:metrics-deployer
@@ -40,7 +40,7 @@
 - name: Test hawkular view permissions
   command: >
     {{ openshift.common.client_binary }}
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     get rolebindings -o jsonpath='{.items[?(@.metadata.name == "view")].userNames}'
   register: view_rolebindings
@@ -49,7 +49,7 @@
 - name: Add view permissions to hawkular SA
   command: >
       {{ openshift.common.client_binary }} adm
-      --config={{ openshift_metrics_kubeconfig }}
+      --config={{ openshift_hosted_metrics_kubeconfig }}
       --namespace openshift-infra
       policy add-role-to-user view
       system:serviceaccount:openshift-infra:hawkular
@@ -58,7 +58,7 @@
 - name: Test cluster-reader permissions
   command: >
     {{ openshift.common.client_binary }}
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     get clusterrolebindings -o jsonpath='{.items[?(@.metadata.name == "cluster-reader")].userNames}'
   register: cluster_reader_clusterrolebindings
@@ -67,7 +67,7 @@
 - name: Add cluster-reader permission to the openshift-infra project to heapster SA
   command: >
     {{ openshift.common.client_binary }} adm
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     policy add-cluster-role-to-user cluster-reader
     system:serviceaccount:openshift-infra:heapster
@@ -76,7 +76,7 @@
 - name: Create metrics-deployer secret
   command: >
     {{ openshift.common.client_binary }}
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     secrets new metrics-deployer nothing=/dev/null
   register: metrics_deployer_secret
@@ -98,7 +98,7 @@
       {{ image_version }} \
       -v MODE={{ deployment_mode }} \
         | {{ openshift.common.client_binary }} --namespace openshift-infra \
-        --config={{ openshift_metrics_kubeconfig }} \
+        --config={{ openshift_hosted_metrics_kubeconfig }} \
         create -o name -f -"
 
 - name: Deploy Metrics
@@ -116,7 +116,7 @@
   shell: >
     {{ openshift.common.client_binary }}
     --namespace openshift-infra
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     get {{ deploy_metrics.stdout }}
   register: deploy_result
   until: "{{ 'Completed' in deploy_result.stdout }}"

roles/openshift_metrics/tasks/main.yaml

@@ -6,11 +6,11 @@
 
 - name: Record kubeconfig tmp dir
   set_fact:
-    openshift_metrics_kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
+    openshift_hosted_metrics_kubeconfig: "{{ mktemp.stdout }}/admin.kubeconfig"
 
 - name: Copy the admin client config(s)
   command: >
-    cp {{ openshift_master_config_dir }}/admin.kubeconfig {{ openshift_metrics_kubeconfig }}
+    cp {{ openshift_master_config_dir }}/admin.kubeconfig {{ openshift_hosted_metrics_kubeconfig }}
   changed_when: False
 
 - name: Set hosted metrics facts
@@ -33,7 +33,7 @@
 - name: Check for existing metrics pods
   shell: >
     {{ openshift.common.client_binary }}
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     get pods -l {{ item }} | grep -q Running
   register: metrics_pods_status
@@ -47,7 +47,7 @@
 - name: Check for previous deployer
   shell: >
     {{ openshift.common.client_binary }}
-    --config={{ openshift_metrics_kubeconfig }}
+    --config={{ openshift_hosted_metrics_kubeconfig }}
     --namespace openshift-infra
     get pods -l metrics-infra=deployer --sort-by='{.metadata.creationTimestamp}' | tail -1 | grep metrics-deployer-
   register: metrics_deployer_status