Merge pull request #8143 from mrsiano/ensure_cadvisor_is_running

cadvisor metrics are missing due to wrong kubernetes version.

roles/openshift_prometheus/tasks/facts.yaml

@@ -6,5 +6,5 @@
   register: oc_version
 
 - set_fact:
-    kubernetes_version: "{{ oc_version.results.kubernetes_short | float }}"
+    kubernetes_version: "{{ '%.2f' | format(oc_version.results.kubernetes_short|float) }}"
     openshift_prometheus_serviceaccount_annotations: "{{ l_openshift_prometheus_serviceaccount_annotations + openshift_prometheus_serviceaccount_annotations|list }}"

roles/openshift_prometheus/templates/prometheus.yml.j2

@@ -100,11 +100,7 @@ scrape_configs:
     ca_file: /var/run/secrets/kubernetes.io/serviceaccount/ca.crt
   bearer_token_file: /var/run/secrets/kubernetes.io/serviceaccount/token
 
-{% if kubernetes_version | float() >= 1.7 | float() %}
   metrics_path: /metrics/cadvisor
-{% else %}
-  metrics_path: /metrics
-{% endif %}
 
   kubernetes_sd_configs:
   - role: node