From 7994159f0421c8bb318e14bcbde4b9050c349c52 Mon Sep 17 00:00:00 2001
From: Mark <mark@openappstack.net>
Date: Tue, 14 Jan 2020 16:09:00 +0000
Subject: [PATCH] Revert "Fix indentation"
This reverts commit 553ae6c8d7e4dcaa7969117e8487c99cb7254560
---
.../apps/templates/monitoring-settings.yaml | 21 +++++++++----------
1 file changed, 10 insertions(+), 11 deletions(-)
diff --git a/ansible/roles/apps/templates/monitoring-settings.yaml b/ansible/roles/apps/templates/monitoring-settings.yaml
index e3b558479..463a1a333 100644
--- a/ansible/roles/apps/templates/monitoring-settings.yaml
+++ b/ansible/roles/apps/templates/monitoring-settings.yaml
@@ -122,17 +122,16 @@ grafana:
grafana.ini:
server:
root_url: "https://grafana.{{ domain }}"
- auth:
- generic_oauth:
- name: OpenAppStack
- enabled: true
- client_id: grafana
- client_secret: "{{ grafana_oauth_client_secret }}"
- scopes: "openid profile email openappstack_roles"
- auth_url: "https://sso.{{ domain }}/oauth2/auth"
- token_url: "https://sso.{{ domain }}/oauth2/token"
- api_url: "https://sso.{{ domain }}/userinfo"
- role_attribute_path: contains(openappstack_roles[*], 'admin') && 'Admin' || 'Editor'
+ auth.generic_oauth:
+ name: OpenAppStack
+ enabled: true
+ client_id: grafana
+ client_secret: "{{ grafana_oauth_client_secret }}"
+ scopes: "openid profile email openappstack_roles"
+ auth_url: "https://sso.{{ domain }}/oauth2/auth"
+ token_url: "https://sso.{{ domain }}/oauth2/token"
+ api_url: "https://sso.{{ domain }}/userinfo"
+ role_attribute_path: contains(openappstack_roles[*], 'admin') && 'Admin' || 'Editor'
ingress:
enabled: true
annotations:
--
GitLab