From d21ab462d1f6d09a9a7b08f4ed0426df4d2b8687 Mon Sep 17 00:00:00 2001
From: Varac <varac@varac.net>
Date: Wed, 12 Jun 2019 17:12:40 +0200
Subject: [PATCH] Use grafana_admin_password instead of
prometheus_grafana_admin_password
---
ansible/group_vars/all/oas.yml | 4 ++--
ansible/roles/setup/tasks/main.yml | 2 +-
test/behave/README.md | 2 +-
test/ci-bootstrap.py | 2 +-
4 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ansible/group_vars/all/oas.yml b/ansible/group_vars/all/oas.yml
index b0dbf15c5..292dc141d 100644
--- a/ansible/group_vars/all/oas.yml
+++ b/ansible/group_vars/all/oas.yml
@@ -11,10 +11,10 @@ nextcloud_password: "{{ lookup('password', './secrets/nextcloud_admin_password c
nextcloud_mariadb_password: "{{ lookup('password', './secrets/nextcloud_mariadb_password chars=ascii_letters') }}"
nextcloud_mariadb_root_password: "{{ lookup('password', './secrets/nextcloud_mariadb_root_password chars=ascii_letters') }}"
collabora_password: "{{ lookup('password', './secrets/collabora_admin_password chars=ascii_letters') }}"
-prometheus_grafana_admin_password: "{{ lookup('password', './secrets/prometheus_grafana_admin_password chars=ascii_letters') }}"
+grafana_admin_password: "{{ lookup('password', './secrets/grafana_admin_password chars=ascii_letters') }}"
# git repo versions
-git_helmfiles_version: '2c0fcbeda044d53cf742280936baa87b8b22d139'
+git_helmfiles_version: '20764510de01f9b6e1001189126d344e57d0e4d1'
git_charts_version: 'HEAD'
git_local_storage_version: 'HEAD'
diff --git a/ansible/roles/setup/tasks/main.yml b/ansible/roles/setup/tasks/main.yml
index f72f6164b..b2fc199ed 100644
--- a/ansible/roles/setup/tasks/main.yml
+++ b/ansible/roles/setup/tasks/main.yml
@@ -218,7 +218,7 @@
- NEXTCLOUD_PASSWORD: "{{ nextcloud_password }}"
- NEXTCLOUD_MARIADB_PASSWORD: "{{ nextcloud_mariadb_password }}"
- NEXTCLOUD_MARIADB_ROOT_PASSWORD: "{{ nextcloud_mariadb_root_password }}"
- - PROMETHEUS_GRAFANA_ADMIN_PASSWORD: "{{ prometheus_grafana_admin_password }}"
+ - GRAFANA_ADMIN_PASSWORD: "{{ grafana_admin_password }}"
command: '/usr/local/bin/helmfile -b /snap/bin/helm -e oas -f /oas/source/repos/helmfiles/helmfile.d/ apply --suppress-secrets'
- name: Get current krew version (plugin manager for kubectl)
diff --git a/test/behave/README.md b/test/behave/README.md
index cb996d7eb..101df8e12 100644
--- a/test/behave/README.md
+++ b/test/behave/README.md
@@ -11,7 +11,7 @@ For nextcloud test:
For grafana test:
behave -D grafana.url=https://grafana.example.openappstack.net \
- -D grafana.password="$(cat ../../ansible/secrets/prometheus_grafana_admin_password)" \
+ -D grafana.password="$(cat ../../ansible/secrets/grafana_admin_password)" \
-t grafana
diff --git a/test/ci-bootstrap.py b/test/ci-bootstrap.py
index 275c28a21..96e7e8050 100755
--- a/test/ci-bootstrap.py
+++ b/test/ci-bootstrap.py
@@ -273,7 +273,7 @@ def write_behave_config(settings=None):
with open('./secrets/nextcloud_admin_password', 'r') as stream:
nextcloud_admin_password = yaml.safe_load(stream)
- with open('./secrets/prometheus_grafana_admin_password', 'r') as stream:
+ with open('./secrets/grafana_admin_password', 'r') as stream:
grafana_admin_password = yaml.safe_load(stream)
behave_config = configparser.ConfigParser()
--
GitLab