Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368333 )
Change subject: releases: rsync reprepro data, set active server in Hiera
......................................................................
releases: rsync reprepro data, set active server in Hiera
Bug: T164030
Change-Id: Ibbe147a5993e3421e7993d64cbd1887e176c6c47
---
M hieradata/common.yaml
M modules/profile/manifests/releases/mediawiki.pp
M modules/profile/manifests/releases/reprepro.pp
M modules/role/manifests/releases.pp
4 files changed, 25 insertions(+), 9 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index e45ce54..1139192 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -466,6 +466,9 @@
netmon_server: netmon1002.wikimedia.org
+releases_server: releases1001.eqiad.wmnet
+releases_server_failover: releases2001.codfw.wmnet
+
# Etcd client global configuration
etcd_client_srv_domain: "conftool.%{::site}.wmnet"
etcd_host: ''
diff --git a/modules/profile/manifests/releases/mediawiki.pp
b/modules/profile/manifests/releases/mediawiki.pp
index 1056941..3a11e24 100644
--- a/modules/profile/manifests/releases/mediawiki.pp
+++ b/modules/profile/manifests/releases/mediawiki.pp
@@ -1,7 +1,9 @@
# server hosting Mediawiki releases
# https://releases.wikimedia.org/mediawiki/
-class profile::releases::mediawiki {
-
+class profile::releases::mediawiki (
+ $active_server = hiera('releases_server'),
+ $passive_server = hiera('releases_server_failover'),
+){
class { '::jenkins':
access_log => true,
http_port => '8080',
@@ -25,4 +27,11 @@
}
backup::set { 'srv-org-wikimedia': }
+
+ rsync::quickdatacopy { 'srv-org-wikimedia-releases':
+ ensure => present,
+ source_host => $active_server,
+ dest_host => $passive_server,
+ module_path => '/srv/org/wikimedia/releases',
+ }
}
diff --git a/modules/profile/manifests/releases/reprepro.pp
b/modules/profile/manifests/releases/reprepro.pp
index bbb0336..2a9f805 100644
--- a/modules/profile/manifests/releases/reprepro.pp
+++ b/modules/profile/manifests/releases/reprepro.pp
@@ -1,6 +1,9 @@
# server hosting Mediawiki releases
# https://releases.wikimedia.org/mediawiki/
-class profile::releases::reprepro {
+class profile::releases::reprepro(
+ $active_server = hiera('releases_server'),
+ $passive_server = hiera('releases_server_failover'),
+){
class { '::releases::reprepro': }
@@ -9,4 +12,11 @@
ensure => present,
rule => 'proto tcp dport ssh saddr $DEPLOYMENT_HOSTS ACCEPT;',
}
+
+ rsync::quickdatacopy { 'srv-org-wikimedia-reprepro':
+ ensure => present,
+ source_host => $active_server,
+ dest_host => $passive_server,
+ module_path => '/srv/org/wikimedia/reprepro',
+ }
}
diff --git a/modules/role/manifests/releases.pp
b/modules/role/manifests/releases.pp
index 9f6ee57..426ddec 100644
--- a/modules/role/manifests/releases.pp
+++ b/modules/role/manifests/releases.pp
@@ -14,10 +14,4 @@
include ::profile::releases::mediawiki
include ::profile::releases::reprepro
- rsync::quickdatacopy { 'srv-org-wikimedia-releases':
- ensure => present,
- source_host => 'releases1001.eqiad.wmnet',
- dest_host => 'releases2001.codfw.wmnet',
- module_path => '/srv/org/wikimedia/releases',
- }
}
--
To view, visit https://gerrit.wikimedia.org/r/368333
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibbe147a5993e3421e7993d64cbd1887e176c6c47
Gerrit-PatchSet: 4
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: Giuseppe Lavagetto <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
