Merge pull request #3558 from ewolinetz/logging_metrics_defaults

Adding some more logging and metrics defaults

5 files changed, 13 insertions, 9 deletions

diff --git a/roles/openshift_logging/tasks/generate_pvcs.yaml b/roles/openshift_logging/tasks/generate_pvcs.yaml
index d6d1abd06..e1629908f 100644
--- a/roles/openshift_logging/tasks/generate_pvcs.yaml
+++ b/roles/openshift_logging/tasks/generate_pvcs.yaml
@@ -6,8 +6,8 @@
     start: "{{es_pvc_names | map('regex_search', es_pvc_prefix+'.*')|select('string')|list|length}}"
   with_sequence: start={{start}} end={{ (start|int > es_cluster_size|int - 1) | ternary(start, es_cluster_size|int - 1)}}
   when:
+    - "{{ es_dc_names|default([]) | length <= es_cluster_size|int }}"
     - es_pvc_size | search('^\d.*')
-    - "{{ es_dc_names|default([]) | length < es_cluster_size|int }}"
   check_mode: no
 
 - name: Generating PersistentVolumeClaims
@@ -16,7 +16,7 @@
     obj_name: "{{claim_name}}"
     size: "{{es_pvc_size}}"
     access_modes:
-      - ReadWriteOnce
+      - "{{ es_access_modes }}"
     pv_selector: "{{es_pv_selector}}"
   with_items:
     - "{{es_pvc_pool | default([])}}"
@@ -36,7 +36,7 @@
       volume.alpha.kubernetes.io/storage-class: "dynamic"
     size: "{{es_pvc_size}}"
     access_modes:
-      - ReadWriteOnce
+      - "{{ es_access_modes }}"
     pv_selector: "{{es_pv_selector}}"
   with_items:
     - "{{es_pvc_pool|default([])}}"
diff --git a/roles/openshift_logging/tasks/install_curator.yaml b/roles/openshift_logging/tasks/install_curator.yaml
index 5b474ff39..ab8e207f1 100644
--- a/roles/openshift_logging/tasks/install_curator.yaml
+++ b/roles/openshift_logging/tasks/install_curator.yaml
@@ -31,7 +31,7 @@
     curator_cpu_limit: "{{openshift_logging_curator_cpu_limit }}"
     curator_memory_limit: "{{openshift_logging_curator_memory_limit }}"
     replicas: "{{curator_replica_count.stdout | default (0)}}"
-    curator_node_selector: "{{openshift_logging_curator_nodeselector | default({}) }}"
+    curator_node_selector: "{{openshift_logging_curator_nodeselector | default({})}}"
   check_mode: no
   changed_when: no
 
diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml
index 6b441c4aa..a0ad12d94 100644
--- a/roles/openshift_logging/tasks/install_elasticsearch.yaml
+++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml
@@ -12,6 +12,7 @@
     es_pvc_size: "{{openshift_logging_es_pvc_size}}"
     es_dc_names: "{{openshift_logging_facts.elasticsearch.deploymentconfigs.keys()}}"
     es_cluster_size: "{{openshift_logging_es_cluster_size}}"
+    es_access_modes: "{{ openshift_logging_storage_access_modes }}"
 
 # we should initialize the es_dc_pool with the current keys
 - name: Init pool of DeploymentConfig names for Elasticsearch
@@ -44,7 +45,7 @@
     volume_names: "{{es_pvc_pool | default([])}}"
     pvc_claim: "{{(volume_names | length > item.0) | ternary(volume_names[item.0], None)}}"
     deploy_name: "{{item.1}}"
-    es_node_selector: "{{openshift_logging_es_nodeselector | default({})}}"
+    es_node_selector: "{{openshift_logging_es_nodeselector | default({}) }}"
   with_indexed_items:
     - "{{ es_dc_pool }}"
   check_mode: no
@@ -77,6 +78,7 @@
     es_cluster_size: "{{openshift_logging_es_ops_cluster_size|int}}"
     es_pvc_dynamic: "{{openshift_logging_es_ops_pvc_dynamic | bool}}"
     es_pv_selector: "{{openshift_logging_es_ops_pv_selector}}"
+    es_access_modes: "{{ openshift_logging_storage_access_modes }}"
   when:
     - openshift_logging_use_ops | bool
   check_mode: no
@@ -119,7 +121,7 @@
     es_recover_after_nodes: "{{es_ops_recover_after_nodes}}"
     es_recover_expected_nodes: "{{es_ops_recover_expected_nodes}}"
     openshift_logging_es_recover_after_time: "{{openshift_logging_es_ops_recover_after_time}}"
-    es_node_selector: "{{openshift_logging_es_ops_nodeselector | default({})}}"
+    es_node_selector: "{{openshift_logging_es_ops_nodeselector | default({}) | map_from_pairs }}"
   with_indexed_items:
     - "{{ es_ops_dc_pool | default([]) }}"
   when:
diff --git a/roles/openshift_logging/tasks/install_kibana.yaml b/roles/openshift_logging/tasks/install_kibana.yaml
index 3aeff2cac..52bdeb50d 100644
--- a/roles/openshift_logging/tasks/install_kibana.yaml
+++ b/roles/openshift_logging/tasks/install_kibana.yaml
@@ -35,7 +35,7 @@
     kibana_proxy_cpu_limit: "{{openshift_logging_kibana_proxy_cpu_limit }}"
     kibana_proxy_memory_limit: "{{openshift_logging_kibana_proxy_memory_limit }}"
     replicas: "{{kibana_replica_count.stdout | default (0)}}"
-    kibana_node_selector: "{{openshift_logging_kibana_nodeselector | default({}) }}"
+    kibana_node_selector: "{{openshift_logging_kibana_nodeselector | default({})}}"
   check_mode: no
   changed_when: no
 
@@ -54,7 +54,7 @@
     kibana_proxy_cpu_limit: "{{openshift_logging_kibana_ops_proxy_cpu_limit }}"
     kibana_proxy_memory_limit: "{{openshift_logging_kibana_ops_proxy_memory_limit }}"
     replicas: "{{kibana_ops_replica_count.stdout | default (0)}}"
-    kibana_node_selector: "{{openshift_logging_kibana_ops_nodeselector | default({}) }}"
+    kibana_node_selector: "{{openshift_logging_kibana_ops_nodeselector | default({})}}"
   when: openshift_logging_use_ops | bool
   check_mode: no
   changed_when: no
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index e23c3f9f1..1beff3bfc 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -76,7 +76,9 @@
   register: link_pull_secret
   loop_control:
     loop_var: sa_account
-  when: openshift_logging_image_pull_secret is defined
+  when:
+  - openshift_logging_image_pull_secret is defined
+  - openshift_logging_image_pull_secret != ''
   failed_when: link_pull_secret.rc != 0
 
 - name: Scaling up cluster