summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-09-19 14:32:10 -0700
committerGitHub <noreply@github.com>2017-09-19 14:32:10 -0700
commita01ee6767c673fe2ee144eb851a5488fcf40f2ec (patch)
tree1a3898ff7924d23dc25d4aca0258a41b45ae4fa4
parenta53bbdece37475859be68d3878f9d6811835b025 (diff)
parent3566f8c0e8ec12995096b3ea9256266c252f3fb8 (diff)
downloadopenshift-a01ee6767c673fe2ee144eb851a5488fcf40f2ec.tar.gz
openshift-a01ee6767c673fe2ee144eb851a5488fcf40f2ec.tar.bz2
openshift-a01ee6767c673fe2ee144eb851a5488fcf40f2ec.tar.xz
openshift-a01ee6767c673fe2ee144eb851a5488fcf40f2ec.zip
Merge pull request #5416 from wozniakjan/bug1491636/honor_ops_nodeselector
Automatic merge from submit-queue Bug 1491636 - honor openshift_logging_es_ops_nodeselector https://bugzilla.redhat.com/show_bug.cgi?id=1491636
-rw-r--r--roles/openshift_logging/tasks/install_logging.yaml2
1 files changed, 2 insertions, 0 deletions
diff --git a/roles/openshift_logging/tasks/install_logging.yaml b/roles/openshift_logging/tasks/install_logging.yaml
index a77df9986..de5e25061 100644
--- a/roles/openshift_logging/tasks/install_logging.yaml
+++ b/roles/openshift_logging/tasks/install_logging.yaml
@@ -134,6 +134,7 @@
openshift_logging_elasticsearch_pvc_pv_selector: "{{ openshift_logging_es_ops_pv_selector }}"
openshift_logging_elasticsearch_memory_limit: "{{ openshift_logging_es_ops_memory_limit }}"
openshift_logging_elasticsearch_cpu_limit: "{{ openshift_logging_es_ops_cpu_limit }}"
+ openshift_logging_elasticsearch_nodeselector: "{{ openshift_logging_es_ops_nodeselector }}"
openshift_logging_es_key: "{{ openshift_logging_es_ops_key }}"
openshift_logging_es_cert: "{{ openshift_logging_es_ops_cert }}"
openshift_logging_es_ca_ext: "{{ openshift_logging_es_ops_ca_ext }}"
@@ -165,6 +166,7 @@
openshift_logging_elasticsearch_pvc_pv_selector: "{{ openshift_logging_es_ops_pv_selector }}"
openshift_logging_elasticsearch_memory_limit: "{{ openshift_logging_es_ops_memory_limit }}"
openshift_logging_elasticsearch_cpu_limit: "{{ openshift_logging_es_ops_cpu_limit }}"
+ openshift_logging_elasticsearch_nodeselector: "{{ openshift_logging_es_ops_nodeselector }}"
openshift_logging_es_key: "{{ openshift_logging_es_ops_key }}"
openshift_logging_es_cert: "{{ openshift_logging_es_ops_cert }}"
openshift_logging_es_ca_ext: "{{ openshift_logging_es_ops_ca_ext }}"