Browse Source

Merge pull request #5543 from ewolinetz/bz1495150

Automatic merge from submit-queue.

Removing setting pvc size and dynamic to remove looped var setting

If we don't set openshift_logging_es_pvc_size but have `openshift_logging_es_pvc_dynamic=True` we see the variable openshift_logging_elasticsearch_pvc_size is set recursively as itself.

Addresses:
 https://bugzilla.redhat.com/show_bug.cgi?id=1495150
 https://bugzilla.redhat.com/show_bug.cgi?id=1496202
OpenShift Merge Robot 7 years ago
parent
commit
d4ea753bf9
1 changed files with 0 additions and 4 deletions
  1. 0 4
      roles/openshift_logging/tasks/install_logging.yaml

+ 0 - 4
roles/openshift_logging/tasks/install_logging.yaml

@@ -74,8 +74,6 @@
     openshift_logging_elasticsearch_replica_count: "{{ openshift_logging_es_cluster_size | int }}"
 
     openshift_logging_elasticsearch_storage_type: "{{ elasticsearch_storage_type }}"
-    openshift_logging_elasticsearch_pvc_size: "{{ openshift_logging_es_pvc_size }}"
-    openshift_logging_elasticsearch_pvc_dynamic: "{{ openshift_logging_es_pvc_dynamic }}"
     openshift_logging_elasticsearch_pvc_pv_selector: "{{ openshift_logging_es_pv_selector }}"
 
   with_together:
@@ -95,8 +93,6 @@
     openshift_logging_elasticsearch_replica_count: "{{ openshift_logging_es_cluster_size | int }}"
 
     openshift_logging_elasticsearch_storage_type: "{{ elasticsearch_storage_type }}"
-    openshift_logging_elasticsearch_pvc_size: "{{ openshift_logging_es_pvc_size }}"
-    openshift_logging_elasticsearch_pvc_dynamic: "{{ openshift_logging_es_pvc_dynamic }}"
     openshift_logging_elasticsearch_pvc_pv_selector: "{{ openshift_logging_es_pv_selector }}"
 
   with_sequence: count={{ openshift_logging_es_cluster_size | int - openshift_logging_facts.elasticsearch.deploymentconfigs.keys() | count }}