diff options
Diffstat (limited to 'roles/openshift_metrics/tasks')
4 files changed, 37 insertions, 9 deletions
diff --git a/roles/openshift_metrics/tasks/install_cassandra.yaml b/roles/openshift_metrics/tasks/install_cassandra.yaml index 158e596ec..e0b37ac26 100644 --- a/roles/openshift_metrics/tasks/install_cassandra.yaml +++ b/roles/openshift_metrics/tasks/install_cassandra.yaml @@ -1,4 +1,11 @@  --- +- name: Ensure that Cassandra has nodes to run on +  fail: +    msg: |- +      No schedulable nodes found matching node selector for cassandra - '{{ openshift_metrics_cassandra_nodeselector }}' +  when: +  - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_metrics_cassandra_nodeselector) +  - shell: >      {{ openshift_client_binary }} -n {{ openshift_metrics_project | quote }}      --config={{ mktemp.stdout }}/admin.kubeconfig diff --git a/roles/openshift_metrics/tasks/install_hawkular.yaml b/roles/openshift_metrics/tasks/install_hawkular.yaml index f45e7a042..de4e89a01 100644 --- a/roles/openshift_metrics/tasks/install_hawkular.yaml +++ b/roles/openshift_metrics/tasks/install_hawkular.yaml @@ -1,4 +1,11 @@  --- +- name: Ensure that Hawkular has nodes to run on +  fail: +    msg: |- +      No schedulable nodes found matching node selector for hawkular - '{{ openshift_metrics_hawkular_nodeselector }}' +  when: +  - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_metrics_hawkular_nodeselector) +  - command: >      {{ openshift_client_binary }} -n {{ openshift_metrics_project | quote }}      --config={{ mktemp.stdout }}/admin.kubeconfig diff --git a/roles/openshift_metrics/tasks/install_heapster.yaml b/roles/openshift_metrics/tasks/install_heapster.yaml index 73e7454f0..e4ddf98ff 100644 --- a/roles/openshift_metrics/tasks/install_heapster.yaml +++ b/roles/openshift_metrics/tasks/install_heapster.yaml @@ -1,4 +1,11 @@  --- +- name: Ensure that Heapster has nodes to run on +  fail: +    msg: |- +      No schedulable nodes found matching node selector for heapster - '{{ openshift_metrics_heapster_nodeselector }}' +  when: +  - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_metrics_heapster_nodeselector) +  - command: >      {{ openshift_client_binary }} -n {{ openshift_metrics_project | quote }}      --config={{ mktemp.stdout }}/admin.kubeconfig @@ -20,8 +27,8 @@  - set_fact:      heapster_sa_secrets: "{{ heapster_sa_secrets + [item] }}"    with_items: -    - hawkular-metrics-certs -    - hawkular-metrics-account +  - hawkular-metrics-certs +  - hawkular-metrics-account    when: not openshift_metrics_heapster_standalone | bool  - name: Generating serviceaccount for heapster @@ -38,7 +45,7 @@    vars:      obj_name: heapster      ports: -      - {port: 80, targetPort: http-endpoint} +    - {port: 80, targetPort: http-endpoint}      selector:        name: "{{obj_name}}"      annotations: @@ -61,9 +68,9 @@        kind: ClusterRole        name: cluster-reader      subjects: -      - kind: ServiceAccount -        name: heapster -        namespace: "{{ openshift_metrics_project }}" +    - kind: ServiceAccount +      name: heapster +      namespace: "{{ openshift_metrics_project }}"    changed_when: no  - include_tasks: generate_heapster_secrets.yaml diff --git a/roles/openshift_metrics/tasks/install_hosa.yaml b/roles/openshift_metrics/tasks/install_hosa.yaml index 7c9bc26d0..3624cb5ab 100644 --- a/roles/openshift_metrics/tasks/install_hosa.yaml +++ b/roles/openshift_metrics/tasks/install_hosa.yaml @@ -1,4 +1,11 @@  --- +- name: Ensure that Hawkular agent has nodes to run on +  fail: +    msg: |- +      No schedulable nodes found matching node selector for Hawkular agent - '{{ openshift_metrics_hawkular_agent_nodeselector }}' +  when: +  - openshift_schedulable_node_labels | lib_utils_oo_has_no_matching_selector(openshift_metrics_hawkular_agent_nodeselector) +  - name: Generate Hawkular Agent (HOSA) Cluster Role    template:      src: hawkular_openshift_agent_role.j2 @@ -38,7 +45,7 @@        kind: ClusterRole        name: hawkular-openshift-agent      subjects: -      - kind: ServiceAccount -        name: hawkular-openshift-agent -        namespace: "{{openshift_metrics_hawkular_agent_namespace}}" +    - kind: ServiceAccount +      name: hawkular-openshift-agent +      namespace: "{{openshift_metrics_hawkular_agent_namespace}}"    changed_when: no  | 
