Alexandros Kosiaris has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/404318 )
Change subject: Deprecate passwords::grafana::production
......................................................................
Deprecate passwords::grafana::production
Move the data into hiera. Also kill passwords::grafana that seems to be
unused for a long time now
Change-Id: I94f83359acef6e303721b337db99ee0124c608e9
---
A hieradata/role/common/webserver_misc_apps.yaml
M modules/passwords/manifests/init.pp
2 files changed, 4 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/labs/private
refs/changes/18/404318/1
diff --git a/hieradata/role/common/webserver_misc_apps.yaml
b/hieradata/role/common/webserver_misc_apps.yaml
new file mode 100644
index 0000000..c373ead
--- /dev/null
+++ b/hieradata/role/common/webserver_misc_apps.yaml
@@ -0,0 +1,2 @@
+profile::grafana::secret_key: aaaaa
+profile::grafana::admin_password: aaaa
diff --git a/modules/passwords/manifests/init.pp
b/modules/passwords/manifests/init.pp
index 2b4dbc8..1b9e2ed 100644
--- a/modules/passwords/manifests/init.pp
+++ b/modules/passwords/manifests/init.pp
@@ -398,17 +398,13 @@
$db_pass = 'dummy'
}
-class passwords::grafana {
- $secret_key = 'aaaaa'
- $admin_password = 'aaaa'
-}
-
+# DEPRECATED - 2017-01-15
class passwords::grafana::production {
$secret_key = 'aaaaa'
$admin_password = 'aaaa'
}
-# DEPRECATE
+# DEPRECATED - 2017-01-15
class passwords::grafana::labs {
$secret_key = 'aaaaab'
$admin_password = 'aaaab'
--
To view, visit https://gerrit.wikimedia.org/r/404318
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I94f83359acef6e303721b337db99ee0124c608e9
Gerrit-PatchSet: 1
Gerrit-Project: labs/private
Gerrit-Branch: master
Gerrit-Owner: Alexandros Kosiaris <akosia...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
