Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/397730 )
Change subject: aptrepo: move Hiera calls into parameter of role class
......................................................................
aptrepo: move Hiera calls into parameter of role class
Change-Id: I154a6d41fbbcd4323ab7d9fa60ef195b0470c822
---
M modules/aptrepo/manifests/rsync.pp
M modules/role/manifests/aptrepo/wikimedia.pp
2 files changed, 12 insertions(+), 8 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/modules/aptrepo/manifests/rsync.pp
b/modules/aptrepo/manifests/rsync.pp
index 1e796fd..8c186c6 100644
--- a/modules/aptrepo/manifests/rsync.pp
+++ b/modules/aptrepo/manifests/rsync.pp
@@ -1,10 +1,9 @@
# sets up rsync of APT repos between 2 servers
# activates rsync for push from the primary to secondary
-class aptrepo::rsync {
-
- $primary_server = hiera('install_server', 'install1002.wikimedia.org')
- $secondary_server = hiera('install_server_failover',
'install2002.wikimedia.org')
-
+class aptrepo::rsync (
+ $primary_server,
+ $secondary_server,
+){
# only activate rsync/firewall hole on the server that is NOT active
if $::fqdn == $primary_server {
diff --git a/modules/role/manifests/aptrepo/wikimedia.pp
b/modules/role/manifests/aptrepo/wikimedia.pp
index 881f5c7..ff7db48 100644
--- a/modules/role/manifests/aptrepo/wikimedia.pp
+++ b/modules/role/manifests/aptrepo/wikimedia.pp
@@ -1,6 +1,8 @@
# http://apt.wikimedia.org/wikimedia/
-class role::aptrepo::wikimedia {
-
+class role::aptrepo::wikimedia (
+ $primary_server = hiera('install_server'),
+ $secondary_server = hiera('install_server_failover'),
+){
$basedir = '/srv/wikimedia'
class { '::aptrepo':
@@ -22,5 +24,8 @@
include ::profile::backup::host
backup::set { 'srv-wikimedia': }
- include aptrepo::rsync
+ class { 'aptrepo::rsync':
+ primary_server => $primary_server,
+ secondary_server => $secondary_server,
+ }
}
--
To view, visit https://gerrit.wikimedia.org/r/397730
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I154a6d41fbbcd4323ab7d9fa60ef195b0470c822
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
