diff options
| author | Jeff Cantrill <jcantrill@users.noreply.github.com> | 2016-11-30 12:12:14 -0500 |
|---|---|---|
| committer | Jeff Cantrill <jcantril@redhat.com> | 2017-01-17 11:45:04 -0500 |
| commit | f3f1f610c9e0fdf8115dd8ea61e647080ad42006 (patch) | |
| tree | eecee6d3d448914af9ce075b31fdf84ecf801b97 /roles/openshift_metrics/tasks/generate_certificates.yaml | |
| parent | 04c1500801f4d88635001bda1e4f73473fe8e33a (diff) | |
| download | openshift-f3f1f610c9e0fdf8115dd8ea61e647080ad42006.tar.gz openshift-f3f1f610c9e0fdf8115dd8ea61e647080ad42006.tar.bz2 openshift-f3f1f610c9e0fdf8115dd8ea61e647080ad42006.tar.xz openshift-f3f1f610c9e0fdf8115dd8ea61e647080ad42006.zip | |
prefix vars with metrics role (#4)
Diffstat (limited to 'roles/openshift_metrics/tasks/generate_certificates.yaml')
| -rw-r--r-- | roles/openshift_metrics/tasks/generate_certificates.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/roles/openshift_metrics/tasks/generate_certificates.yaml b/roles/openshift_metrics/tasks/generate_certificates.yaml index b1ecf46b9..9f6a3348e 100644 --- a/roles/openshift_metrics/tasks/generate_certificates.yaml +++ b/roles/openshift_metrics/tasks/generate_certificates.yaml @@ -25,14 +25,14 @@ # TODO maybe there's an easier way to get the service accounts' ca crt? - name: get heapster service account secrets shell: > - {{ openshift.common.client_binary }} -n '{{ metrics_project }}' + {{ openshift.common.client_binary }} -n '{{ openshift_metrics_project }}' get serviceaccount/default --template '{{ '{{range .secrets}}{{println .name}}{{end}}' }}' | grep ^default-token- register: sa_secret - name: get heapster service account ca command: > - {{ openshift.common.client_binary }} -n '{{ metrics_project }}' + {{ openshift.common.client_binary }} -n '{{ openshift_metrics_project }}' get 'secret/{{ sa_secret.stdout }}' --template '{{ '{{index .data "ca.crt"}}' }}' register: sa_secret @@ -54,12 +54,12 @@ heapster.cert: "{{ heapster_secret.results[0].stdout }}" heapster.key: "{{ heapster_secret.results[1].stdout }}" heapster.client-ca: "{{ sa_secret.stdout }}" - heapster.allowed-users: "{{ heapster_allowed_users|b64encode }}" + heapster.allowed-users: "{{ openshift_metrics_heapster_allowed_users|b64encode }}" - name: generate hawkular-metrics certificates include: setup_certificate.yaml vars: component: hawkular-metrics - hostnames: "hawkular-metrics,{{ hawkular_metrics_hostname }}" + hostnames: "hawkular-metrics,{{ openshift_metrics_hawkular_metrics_hostname }}" - name: generate hawkular-cassandra certificates include: setup_certificate.yaml vars: |