summaryrefslogtreecommitdiffstats
path: root/roles/openshift_logging_kibana
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-07-27 18:38:38 -0400
committerGitHub <noreply@github.com>2017-07-27 18:38:38 -0400
commit95c9c869c8503e9bb2af4ef496ee9fb5d3b3a1ca (patch)
tree8c7d4683425221f78cd6aa16a49b4a84385a4e1f /roles/openshift_logging_kibana
parente7ae854e6f9bbdcf961d00928c55345f706567d3 (diff)
parent6ab204b03a05c04b024b1f7b1807a840ace550d1 (diff)
downloadopenshift-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_kibana')
-rw-r--r--roles/openshift_logging_kibana/tasks/main.yaml2
-rw-r--r--roles/openshift_logging_kibana/templates/kibana.j22
2 files changed, 2 insertions, 2 deletions
diff --git a/roles/openshift_logging_kibana/tasks/main.yaml b/roles/openshift_logging_kibana/tasks/main.yaml
index 93cb82793..62bc26e37 100644
--- a/roles/openshift_logging_kibana/tasks/main.yaml
+++ b/roles/openshift_logging_kibana/tasks/main.yaml
@@ -233,7 +233,7 @@
kibana_memory_limit: "{{ openshift_logging_kibana_memory_limit }}"
kibana_proxy_cpu_limit: "{{ openshift_logging_kibana_proxy_cpu_limit }}"
kibana_proxy_memory_limit: "{{ openshift_logging_kibana_proxy_memory_limit }}"
- replicas: "{{ openshift_logging_kibana_replicas | default (1) }}"
+ kibana_replicas: "{{ openshift_logging_kibana_replicas | default (1) }}"
kibana_node_selector: "{{ openshift_logging_kibana_nodeselector | default({}) }}"
- name: Set Kibana DC
diff --git a/roles/openshift_logging_kibana/templates/kibana.j2 b/roles/openshift_logging_kibana/templates/kibana.j2
index f8043812b..512d99d06 100644
--- a/roles/openshift_logging_kibana/templates/kibana.j2
+++ b/roles/openshift_logging_kibana/templates/kibana.j2
@@ -7,7 +7,7 @@ metadata:
component: "{{ component }}"
logging-infra: "{{ logging_component }}"
spec:
- replicas: {{ replicas | default(1) }}
+ replicas: {{ kibana_replicas | default(1) }}
selector:
provider: openshift
component: "{{ component }}"