diff options
| author | ewolinetz <ewolinet@redhat.com> | 2017-07-27 11:57:07 -0500 |
|---|---|---|
| committer | ewolinetz <ewolinet@redhat.com> | 2017-07-27 11:57:07 -0500 |
| commit | 6ab204b03a05c04b024b1f7b1807a840ace550d1 (patch) | |
| tree | e871f2c8169234ba4f7ee71e83b33fbf6555cdea /roles/openshift_logging_elasticsearch | |
| parent | c2fd5d29c84bf0351efa5af1acc757cf602d5ed5 (diff) | |
| download | openshift-6ab204b03a05c04b024b1f7b1807a840ace550d1.tar.gz openshift-6ab204b03a05c04b024b1f7b1807a840ace550d1.tar.bz2 openshift-6ab204b03a05c04b024b1f7b1807a840ace550d1.tar.xz openshift-6ab204b03a05c04b024b1f7b1807a840ace550d1.zip | |
Updating template parameter replica to be more unique to avoid var scope creeping
Diffstat (limited to 'roles/openshift_logging_elasticsearch')
| -rw-r--r-- | roles/openshift_logging_elasticsearch/tasks/main.yaml | 2 | ||||
| -rw-r--r-- | roles/openshift_logging_elasticsearch/templates/es.j2 | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/roles/openshift_logging_elasticsearch/tasks/main.yaml b/roles/openshift_logging_elasticsearch/tasks/main.yaml index 532f4a85d..0548e3c40 100644 --- a/roles/openshift_logging_elasticsearch/tasks/main.yaml +++ b/roles/openshift_logging_elasticsearch/tasks/main.yaml @@ -257,7 +257,7 @@ es_memory_limit: "{{ openshift_logging_elasticsearch_memory_limit }}" es_node_selector: "{{ openshift_logging_elasticsearch_nodeselector | default({}) }}" deploy_type: "{{ openshift_logging_elasticsearch_deployment_type }}" - replicas: 1 + es_replicas: 1 - name: Set ES dc oc_obj: diff --git a/roles/openshift_logging_elasticsearch/templates/es.j2 b/roles/openshift_logging_elasticsearch/templates/es.j2 index 7424db6f6..cbe6b89f2 100644 --- a/roles/openshift_logging_elasticsearch/templates/es.j2 +++ b/roles/openshift_logging_elasticsearch/templates/es.j2 @@ -8,7 +8,7 @@ metadata: deployment: "{{deploy_name}}" logging-infra: "{{logging_component}}" spec: - replicas: {{replicas|default(1)}} + replicas: {{es_replicas|default(1)}} selector: provider: openshift component: "{{component}}" @@ -78,7 +78,7 @@ spec: name: "INSTANCE_RAM" value: "{{openshift_logging_elasticsearch_memory_limit}}" - - name: "HEAP_DUMP_LOCATION" + name: "HEAP_DUMP_LOCATION" value: "/elasticsearch/persistent/heapdump.hprof" - name: "NODE_QUORUM" |