Ottomata has uploaded a new change for review.
https://gerrit.wikimedia.org/r/277857
Change subject: Use direct hiera lookup instead of parameter in
role::analytics_cluster::database::meta::backup
......................................................................
Use direct hiera lookup instead of parameter in
role::analytics_cluster::database::meta::backup
Couldn't get parameter on role class to work properly
Change-Id: I67822e6f40295dc9b9d22b95c9a2a5c1545483bc
---
M hieradata/eqiad.yaml
M modules/role/manifests/analytics_cluster/database/meta/backup.pp
2 files changed, 10 insertions(+), 7 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/57/277857/1
diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml
index 6e46e33..c9768d2 100644
--- a/hieradata/eqiad.yaml
+++ b/hieradata/eqiad.yaml
@@ -156,4 +156,4 @@
# analytics1002. This works because the analytics1002 has the
# role::analyitcs_cluster::database::meta::backup_dest class
# applied to it.
-role::analytics_cluster::database::meta::backup::dest:
analytics1002.eqiad.wmnet::backup/mysql/analytics-meta
\ No newline at end of file
+analytics_cluster_meta_database_backup_rsync_dest:
analytics1002.eqiad.wmnet::backup/mysql/analytics-meta
\ No newline at end of file
diff --git a/modules/role/manifests/analytics_cluster/database/meta/backup.pp
b/modules/role/manifests/analytics_cluster/database/meta/backup.pp
index 881a613..ee464e9 100644
--- a/modules/role/manifests/analytics_cluster/database/meta/backup.pp
+++ b/modules/role/manifests/analytics_cluster/database/meta/backup.pp
@@ -2,18 +2,21 @@
# Uses mysql_wmf::mylvmbackup to take backups of the
# analytics-meta mysql instance.
#
-# == Parameters
+# == Hiera Variables
#
-# [*dest*]
-# Rsync path for backup. Default: /srv/backups/mysql/analytics-meta/
+# [*analytics_cluster_meta_database_backup_rsync_dest*]
+# Rsync path for backup. Default: /srv/backups/mysql/analytics-meta
# You could include role::analytics_cluster::database::meta::backup_dest
# on some other node, and then set $dest here to
# other.node.org::backup/mysql/analytics-meta/ and backups would
# be rsynced elsewhere.
#
-class role::analytics_cluster::database::meta::backup(
- $dest = '/srv/backup/mysql/analytics-meta'
-) {
+class role::analytics_cluster::database::meta::backup {
+ $dest = hiera(
+ 'analytics_cluster_meta_database_backup_rsync_dest',
+ '/srv/backups/mysql/analytics-meta'
+ )
+
# Take hourly backups of the analytics-meta instance
# and rsync those backups to $dest.
mysql_wmf::mylvmbackup { 'analytics-meta':
--
To view, visit https://gerrit.wikimedia.org/r/277857
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I67822e6f40295dc9b9d22b95c9a2a5c1545483bc
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Ottomata <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
