diff options
| author | Scott Dodson <sdodson@redhat.com> | 2017-02-06 15:43:43 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-06 15:43:43 -0500 |
| commit | 1b910a05286d1368d69998a0f5c79fb6eaee2c21 (patch) | |
| tree | 3489744a1a52ab12e03528e110701e173de0999b /roles/openshift_metrics/tasks | |
| parent | e27da6a8b7423f48d2bf989315cf41fc0188aee2 (diff) | |
| parent | 21966b722781bb04b0b7a374685e428b77fd4f0a (diff) | |
| download | openshift-1b910a05286d1368d69998a0f5c79fb6eaee2c21.tar.gz openshift-1b910a05286d1368d69998a0f5c79fb6eaee2c21.tar.bz2 openshift-1b910a05286d1368d69998a0f5c79fb6eaee2c21.tar.xz openshift-1b910a05286d1368d69998a0f5c79fb6eaee2c21.zip | |
Merge pull request #3271 from jcantrill/metrics_node_selectors
fix 1406057. Allow openshift_metrics nodeselectors for components
Diffstat (limited to 'roles/openshift_metrics/tasks')
| -rw-r--r-- | roles/openshift_metrics/tasks/install_cassandra.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install_hawkular.yaml | 1 | ||||
| -rw-r--r-- | roles/openshift_metrics/tasks/install_heapster.yaml | 1 |
3 files changed, 3 insertions, 0 deletions
diff --git a/roles/openshift_metrics/tasks/install_cassandra.yaml b/roles/openshift_metrics/tasks/install_cassandra.yaml index a9340acc3..9e25071af 100644 --- a/roles/openshift_metrics/tasks/install_cassandra.yaml +++ b/roles/openshift_metrics/tasks/install_cassandra.yaml @@ -18,6 +18,7 @@ node: "{{ item }}" master: "{{ (item == '1')|string|lower }}" replica_count: "{{cassandra_replica_count.results[item|int - 1].stdout}}" + node_selector: "{{openshift_metrics_cassandra_nodeselector | default('') }}" with_sequence: count={{ openshift_metrics_cassandra_replicas }} changed_when: false diff --git a/roles/openshift_metrics/tasks/install_hawkular.yaml b/roles/openshift_metrics/tasks/install_hawkular.yaml index 00f7b2554..1ba11efa8 100644 --- a/roles/openshift_metrics/tasks/install_hawkular.yaml +++ b/roles/openshift_metrics/tasks/install_hawkular.yaml @@ -13,6 +13,7 @@ dest: "{{ mktemp.stdout }}/templates/hawkular_metrics_rc.yaml" vars: replica_count: "{{hawkular_metrics_replica_count.stdout | default(0)}}" + node_selector: "{{openshift_metrics_hawkular_nodeselector | default('') }}" changed_when: false - name: read hawkular-metrics route destination ca certificate diff --git a/roles/openshift_metrics/tasks/install_heapster.yaml b/roles/openshift_metrics/tasks/install_heapster.yaml index 39df797ab..44bab8ace 100644 --- a/roles/openshift_metrics/tasks/install_heapster.yaml +++ b/roles/openshift_metrics/tasks/install_heapster.yaml @@ -11,4 +11,5 @@ template: src=heapster.j2 dest={{mktemp.stdout}}/templates/metrics-heapster-rc.yaml vars: replica_count: "{{heapster_replica_count.stdout | default(0)}}" + node_selector: "{{openshift_metrics_heapster_nodeselector | default('') }}" changed_when: no |