From 7318e26c4f9d694dd5ed58df5927eea73060054d Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Thu, 16 Jun 2016 17:19:42 -0400 Subject: Pull in keynote demo changes --- roles/openshift_metrics/vars/main.yaml | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'roles/openshift_metrics/vars') 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' }}" - -- cgit v1.2.3 From b1ce2cc8803cc5ac87a6bfcb22554ba8662c3009 Mon Sep 17 00:00:00 2001 From: Scott Dodson Date: Tue, 2 Aug 2016 12:29:20 -0400 Subject: Add logic to detect existing installs However, due to testing constraints we're only supporting 'greenfield' installs right now. --- roles/openshift_metrics/vars/main.yaml | 2 ++ 1 file changed, 2 insertions(+) (limited to 'roles/openshift_metrics/vars') diff --git a/roles/openshift_metrics/vars/main.yaml b/roles/openshift_metrics/vars/main.yaml index bd542382f..0331bcb89 100644 --- a/roles/openshift_metrics/vars/main.yaml +++ b/roles/openshift_metrics/vars/main.yaml @@ -16,3 +16,5 @@ 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' }}" + +metrics_upgrade: openshift.hosted.metrics.upgrade | default(False) -- cgit v1.2.3