Merge pull request #4085 from ewolinetz/pick_issue4083

Merged by openshift-bot

5 files changed, 2 insertions, 14 deletions

diff --git a/roles/openshift_logging/README.md b/roles/openshift_logging/README.md
index 42f4fc72e..cba0f2de8 100644
--- a/roles/openshift_logging/README.md
+++ b/roles/openshift_logging/README.md
@@ -91,8 +91,6 @@ same as above for their non-ops counterparts, but apply to the OPS cluster insta
 - `openshift_logging_es_ops_pvc_prefix`: logging-es-ops
 - `openshift_logging_es_ops_recover_after_time`: 5m
 - `openshift_logging_es_ops_storage_group`: 65534
-- `openshift_logging_es_ops_number_of_shards`: The number of primary shards for every new index created in ES. Defaults to '1'.
-- `openshift_logging_es_ops_number_of_replicas`: The number of replica shards per primary shard for every new index. Defaults to '0'. 
 - `openshift_logging_kibana_ops_hostname`: The Operations Kibana hostname. Defaults to 'kibana-ops.example.com'.
 - `openshift_logging_kibana_ops_cpu_limit`: The amount of CPU to allocate to Kibana or unset if not specified.
 - `openshift_logging_kibana_ops_memory_limit`: The amount of memory to allocate to Kibana or unset if not specified.
diff --git a/roles/openshift_logging/defaults/main.yml b/roles/openshift_logging/defaults/main.yml
index dbf5b4d3d..c05cc5f98 100644
--- a/roles/openshift_logging/defaults/main.yml
+++ b/roles/openshift_logging/defaults/main.yml
@@ -117,8 +117,6 @@ openshift_logging_es_ops_pvc_prefix: "{{ openshift_hosted_logging_elasticsearch_
 openshift_logging_es_ops_recover_after_time: 5m
 openshift_logging_es_ops_storage_group: "{{ openshift_hosted_logging_elasticsearch_storage_group | default('65534') }}"
 openshift_logging_es_ops_nodeselector: "{{ openshift_hosted_logging_elasticsearch_ops_nodeselector | default('') | map_from_pairs }}"
-openshift_logging_es_ops_number_of_shards: 1
-openshift_logging_es_ops_number_of_replicas: 0
 
 # storage related defaults
 openshift_logging_storage_access_modes: "{{ openshift_hosted_logging_storage_access_modes | default(['ReadWriteOnce']) }}"
diff --git a/roles/openshift_logging/tasks/generate_configmaps.yaml b/roles/openshift_logging/tasks/generate_configmaps.yaml
index 44bd0058a..b047eb35a 100644
--- a/roles/openshift_logging/tasks/generate_configmaps.yaml
+++ b/roles/openshift_logging/tasks/generate_configmaps.yaml
@@ -21,6 +21,8 @@
         dest="{{local_tmp.stdout}}/elasticsearch-gen-template.yml"
       vars:
         - allow_cluster_reader: "{{openshift_logging_es_ops_allow_cluster_reader | lower | default('false')}}"
+        - es_number_of_shards: "{{ openshift_logging_es_number_of_shards | default(1) }}"
+        - es_number_of_replicas: "{{ openshift_logging_es_number_of_replicas | default(0) }}"
       when: es_config_contents is undefined
       changed_when: no
 
diff --git a/roles/openshift_logging/tasks/install_elasticsearch.yaml b/roles/openshift_logging/tasks/install_elasticsearch.yaml
index 878010eb0..29c866e08 100644
--- a/roles/openshift_logging/tasks/install_elasticsearch.yaml
+++ b/roles/openshift_logging/tasks/install_elasticsearch.yaml
@@ -20,8 +20,6 @@
     es_pv_selector: "{{ openshift_logging_es_pv_selector }}"
     es_cpu_limit: "{{ openshift_logging_es_cpu_limit }}"
     es_memory_limit: "{{ openshift_logging_es_memory_limit }}"
-    es_number_of_shards: "{{ openshift_logging_es_number_of_shards }}"
-    es_number_of_replicas: "{{ openshift_logging_es_number_of_replicas }}"
   with_together:
   - "{{ openshift_logging_facts.elasticsearch.deploymentconfigs.keys() }}"
   - "{{ openshift_logging_facts.elasticsearch.deploymentconfigs.values() }}"
@@ -43,8 +41,6 @@
     es_pv_selector: "{{ openshift_logging_es_pv_selector }}"
     es_cpu_limit: "{{ openshift_logging_es_cpu_limit }}"
     es_memory_limit: "{{ openshift_logging_es_memory_limit }}"
-    es_number_of_shards: "{{ openshift_logging_es_number_of_shards }}"
-    es_number_of_replicas: "{{ openshift_logging_es_number_of_replicas }}"
   with_sequence: count={{ openshift_logging_es_cluster_size | int - openshift_logging_facts.elasticsearch.deploymentconfigs | count }}
 
 # --------- Tasks for Operation clusters ---------
@@ -80,8 +76,6 @@
     es_pv_selector: "{{ openshift_logging_es_ops_pv_selector }}"
     es_cpu_limit: "{{ openshift_logging_es_ops_cpu_limit }}"
     es_memory_limit: "{{ openshift_logging_es_ops_memory_limit }}"
-    es_number_of_shards: "{{ openshift_logging_es_ops_number_of_shards }}"
-    es_number_of_replicas: "{{ openshift_logging_es_ops_number_of_replicas }}"
   with_together:
   - "{{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs.keys() }}"
   - "{{ openshift_logging_facts.elasticsearch_ops.deploymentconfigs.values() }}"
@@ -105,8 +99,6 @@
     es_pv_selector: "{{ openshift_logging_es_ops_pv_selector }}"
     es_cpu_limit: "{{ openshift_logging_es_ops_cpu_limit }}"
     es_memory_limit: "{{ openshift_logging_es_ops_memory_limit }}"
-    es_number_of_shards: "{{ openshift_logging_es_ops_number_of_shards }}"
-    es_number_of_replicas: "{{ openshift_logging_es_ops_number_of_replicas }}"
   with_sequence: count={{ openshift_logging_es_ops_cluster_size | int - openshift_logging_facts.elasticsearch_ops.deploymentconfigs | count }}
   when:
   - openshift_logging_use_ops | bool
diff --git a/roles/openshift_logging/tasks/set_es_storage.yaml b/roles/openshift_logging/tasks/set_es_storage.yaml
index 198b1d04d..0bb4d5ee5 100644
--- a/roles/openshift_logging/tasks/set_es_storage.yaml
+++ b/roles/openshift_logging/tasks/set_es_storage.yaml
@@ -76,7 +76,5 @@
     es_memory_limit: "{{ es_memory_limit }}"
     es_node_selector: "{{ es_node_selector }}"
     es_storage: "{{ openshift_logging_facts | es_storage( es_name, es_storage_claim ) }}"
-    es_number_of_shards: "{{ es_number_of_shards }}"
-    es_number_of_replicas: "{{ es_number_of_replicas }}"
   check_mode: no
   changed_when: no