summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-04 18:10:36 -0700
committerGitHub <noreply@github.com>2017-10-04 18:10:36 -0700
commitd4ea753bf99272c3b93bcdf420f9e1eee410050c (patch)
tree17487d818c12a3b96fb566968ac37cdda4b6ab24
parent30daf85143720c1350a197a8b40f9f1dbff34f29 (diff)
parentdd9c36785beeded7869398edc831ad44fd041033 (diff)
downloadopenshift-d4ea753bf99272c3b93bcdf420f9e1eee410050c.tar.gz
openshift-d4ea753bf99272c3b93bcdf420f9e1eee410050c.tar.bz2
openshift-d4ea753bf99272c3b93bcdf420f9e1eee410050c.tar.xz
openshift-d4ea753bf99272c3b93bcdf420f9e1eee410050c.zip
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
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml4
1 files changed, 0 insertions, 4 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index 2695ef030..a3e653cb8 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/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 }}