summaryrefslogtreecommitdiffstats
path: root/roles/openshift_metrics/vars
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2016-06-16 17:19:42 -0400
committerScott Dodson <sdodson@redhat.com>2016-08-24 16:02:48 -0400
commit7318e26c4f9d694dd5ed58df5927eea73060054d (patch)
tree55bc4a339ec5ba19c20869a5507d4286bb9e88b1 /roles/openshift_metrics/vars
parent91e069ea569b097959aab93fa0a0bc5865e45123 (diff)
downloadopenshift-7318e26c4f9d694dd5ed58df5927eea73060054d.tar.gz
openshift-7318e26c4f9d694dd5ed58df5927eea73060054d.tar.bz2
openshift-7318e26c4f9d694dd5ed58df5927eea73060054d.tar.xz
openshift-7318e26c4f9d694dd5ed58df5927eea73060054d.zip
Pull in keynote demo changes
Diffstat (limited to 'roles/openshift_metrics/vars')
-rw-r--r--roles/openshift_metrics/vars/main.yaml15
1 files changed, 7 insertions, 8 deletions
diff --git a/roles/openshift_metrics/vars/main.yaml b/roles/openshift_metrics/vars/main.yaml
index 82d9d29f7..bd542382f 100644
--- a/roles/openshift_metrics/vars/main.yaml
+++ b/roles/openshift_metrics/vars/main.yaml
@@ -2,13 +2,13 @@ hawkular_permission_oc_commands:
- policy add-role-to-user edit system:serviceaccount:openshift-infra:metrics-deployer -n openshift-infra
- policy add-cluster-role-to-user cluster-admin system:serviceaccount:openshift-infra:heapster
-deployer_service_account:
- apiVersion: v1
- kind: ServiceAccount
- metadata:
- name: metrics-deployer
- secrets:
- - name: metrics-deployer
+metrics_deployer_sa:
+ apiVersion: v1
+ kind: ServiceAccount
+ metadata:
+ name: metrics-deployer
+ secrets:
+ - name: metrics-deployer
hawkular_tmp_conf: /tmp/hawkular_admin.kubeconfig
@@ -16,4 +16,3 @@ hawkular_tmp_conf: /tmp/hawkular_admin.kubeconfig
hawkular_persistence: "{% if openshift.hosted.metrics.storage.kind != None %}true{% else %}false{% endif %}"
hawkular_type: "{{ 'origin' if deployment_type == 'origin' else 'enterprise' }}"
-