diff options
| author | Scott Dodson <sdodson@redhat.com> | 2016-08-25 09:33:21 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-25 09:33:21 -0400 |
| commit | d08a872a0392c100e86eed41f5d5372d226538c0 (patch) | |
| tree | 14286133d094e90882258506cf34d25ada484f37 /roles/openshift_metrics/vars | |
| parent | 0af3d7cd96e4584c2d1301d84c1f02234a8cfdb5 (diff) | |
| parent | 3f2d71a1bfb589778733dd8eb0ccd6b1dac31d79 (diff) | |
| download | openshift-d08a872a0392c100e86eed41f5d5372d226538c0.tar.gz openshift-d08a872a0392c100e86eed41f5d5372d226538c0.tar.bz2 openshift-d08a872a0392c100e86eed41f5d5372d226538c0.tar.xz openshift-d08a872a0392c100e86eed41f5d5372d226538c0.zip | |
Merge pull request #2052 from sdodson/metrics
Metrics improvements
Diffstat (limited to 'roles/openshift_metrics/vars')
| -rw-r--r-- | roles/openshift_metrics/vars/main.yaml | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/roles/openshift_metrics/vars/main.yaml b/roles/openshift_metrics/vars/main.yaml index 82d9d29f7..0331bcb89 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 @@ -17,3 +17,4 @@ hawkular_persistence: "{% if openshift.hosted.metrics.storage.kind != None %}tru hawkular_type: "{{ 'origin' if deployment_type == 'origin' else 'enterprise' }}" +metrics_upgrade: openshift.hosted.metrics.upgrade | default(False) |