diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-07-27 18:38:38 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-07-27 18:38:38 -0400 |
| commit | 95c9c869c8503e9bb2af4ef496ee9fb5d3b3a1ca (patch) | |
| tree | 8c7d4683425221f78cd6aa16a49b4a84385a4e1f /roles/openshift_logging_elasticsearch | |
| parent | e7ae854e6f9bbdcf961d00928c55345f706567d3 (diff) | |
| parent | 6ab204b03a05c04b024b1f7b1807a840ace550d1 (diff) | |
| download | openshift-95c9c869c8503e9bb2af4ef496ee9fb5d3b3a1ca.tar.gz openshift-95c9c869c8503e9bb2af4ef496ee9fb5d3b3a1ca.tar.bz2 openshift-95c9c869c8503e9bb2af4ef496ee9fb5d3b3a1ca.tar.xz openshift-95c9c869c8503e9bb2af4ef496ee9fb5d3b3a1ca.zip | |
Merge pull request #4906 from ewolinetz/logging_unique_template_vars
Updating template parameter replica to be more unique to avoid var sc…
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" |