diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-01-25 08:35:16 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-01-25 08:35:16 -0500 |
| commit | 223f3e1d99470c53dc5fdc92702bb1c17d18837a (patch) | |
| tree | d2e5d6b986bbd516461b24ef592aa44114eba188 /roles/openshift_logging/templates | |
| parent | 800d0d9872807a3173ae268166d211c40fb34283 (diff) | |
| parent | d86bf1c52ca9e92679f6ad3ab4cc1315f067ff26 (diff) | |
| download | openshift-223f3e1d99470c53dc5fdc92702bb1c17d18837a.tar.gz openshift-223f3e1d99470c53dc5fdc92702bb1c17d18837a.tar.bz2 openshift-223f3e1d99470c53dc5fdc92702bb1c17d18837a.tar.xz openshift-223f3e1d99470c53dc5fdc92702bb1c17d18837a.zip | |
Merge pull request #3169 from jcantrill/logging_node_selector
allow openshift_logging role to specify nodeSelectors
Diffstat (limited to 'roles/openshift_logging/templates')
| -rw-r--r-- | roles/openshift_logging/templates/curator.j2 | 6 | ||||
| -rw-r--r-- | roles/openshift_logging/templates/es.j2 | 6 | ||||
| -rw-r--r-- | roles/openshift_logging/templates/kibana.j2 | 6 |
3 files changed, 18 insertions, 0 deletions
diff --git a/roles/openshift_logging/templates/curator.j2 b/roles/openshift_logging/templates/curator.j2 index d3b5d33a2..de6258eaa 100644 --- a/roles/openshift_logging/templates/curator.j2 +++ b/roles/openshift_logging/templates/curator.j2 @@ -28,6 +28,12 @@ spec: spec: terminationGracePeriod: 600 serviceAccountName: aggregated-logging-curator +{% if curator_node_selector is iterable and curator_node_selector | length > 0 %} + nodeSelector: +{% for key, value in curator_node_selector.iteritems() %} + {{key}}: {{value}} +{% endfor %} +{% endif %} containers: - name: "curator" diff --git a/roles/openshift_logging/templates/es.j2 b/roles/openshift_logging/templates/es.j2 index 291589690..ec84c6b76 100644 --- a/roles/openshift_logging/templates/es.j2 +++ b/roles/openshift_logging/templates/es.j2 @@ -30,6 +30,12 @@ spec: securityContext: supplementalGroups: - {{openshift_logging_es_storage_group}} +{% if es_node_selector is iterable and es_node_selector | length > 0 %} + nodeSelector: +{% for key, value in es_node_selector.iteritems() %} + {{key}}: {{value}} +{% endfor %} +{% endif %} containers: - name: "elasticsearch" diff --git a/roles/openshift_logging/templates/kibana.j2 b/roles/openshift_logging/templates/kibana.j2 index 1ec97701a..b42f62850 100644 --- a/roles/openshift_logging/templates/kibana.j2 +++ b/roles/openshift_logging/templates/kibana.j2 @@ -27,6 +27,12 @@ spec: component: "{{component}}" spec: serviceAccountName: aggregated-logging-kibana +{% if kibana_node_selector is iterable and kibana_node_selector | length > 0 %} + nodeSelector: +{% for key, value in kibana_node_selector.iteritems() %} + {{key}}: {{value}} +{% endfor %} +{% endif %} containers: - name: "kibana" |