Akosiaris has submitted this change and it was merged.
Change subject: Adding various servers to backup
......................................................................
Adding various servers to backup
Using mostly the classes included by site.pp for the following services,
mirroring old backup infrastructure. Servers added will be:
sodium.wikimedia.org
stat1002.eqiad.wmnet
stat1002.eqiad.wmnet
stat1.wikimedia.org
stat1.wikimedia.org
virt0.wikimedia.org
sanger.wikimedia.org
mchenry.wikimedia.org
sockpuppet.pmtpa.wmnet
Change-Id: Ibba57ee0721ec1e3cf14490826469a6ac0a38455
---
M manifests/mail.pp
M manifests/misc/statistics.pp
M manifests/openstack.pp
M manifests/puppetmaster.pp
M manifests/site.pp
5 files changed, 24 insertions(+), 0 deletions(-)
Approvals:
Akosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/mail.pp b/manifests/mail.pp
index 6ef78dc..7a10477 100644
--- a/manifests/mail.pp
+++ b/manifests/mail.pp
@@ -188,6 +188,10 @@
ensure => present;
}
+ class { 'backup::host':
+ sets => [ 'var-vmail', ]
+ }
+
class mail_relay {
Class["exim::config"] -> Class[exim::roled::mail_relay]
@@ -211,6 +215,10 @@
class mailman {
Class["exim::config"] -> Class[exim::roled::mailman]
+ class {'backup::host':
+ sets => ['var-lib-mailman', ]
+ }
+
file { '/etc/exim4/aliases/lists.wikimedia.org':
owner => root,
group => root,
diff --git a/manifests/misc/statistics.pp b/manifests/misc/statistics.pp
index c53433b..3db8a88 100644
--- a/manifests/misc/statistics.pp
+++ b/manifests/misc/statistics.pp
@@ -726,6 +726,10 @@
source =>
"vanadium.eqiad.wmnet::eventlogging/archive/*.gz",
destination => "/a/eventlogging/archive",
}
+
+ class { 'backup::host':
+ sets => [ 'a-eventlogging', 'home', ]
+ }
}
# Define: misc::statistics::rsync_job
diff --git a/manifests/openstack.pp b/manifests/openstack.pp
index 113d753..bff3817 100644
--- a/manifests/openstack.pp
+++ b/manifests/openstack.pp
@@ -544,6 +544,10 @@
apache_site { controller: name => "${controller_hostname}" }
apache_module { rewrite: name => "rewrite" }
+
+ class { 'backup::host':
+ sets => [ 'a-backup', ]
+ }
}
class openstack::scheduler-service($openstack_version="folsom", $novaconfig) {
diff --git a/manifests/puppetmaster.pp b/manifests/puppetmaster.pp
index 4757293..ccf1842 100644
--- a/manifests/puppetmaster.pp
+++ b/manifests/puppetmaster.pp
@@ -31,6 +31,10 @@
ensure => latest;
}
+ class { 'backup::host':
+ sets => [ 'var-lib-puppet-ssl', ]
+ }
+
class ssl($server_name="puppet", $ca="false") {
$ssldir = "/var/lib/puppet/server/ssl"
diff --git a/manifests/site.pp b/manifests/site.pp
index 7be88e2..68f5fff 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1822,6 +1822,10 @@
# mails the wikimedia.org mail alias file to OIT once per week
class { misc::maintenance::mail_exim_aliases: enabled => true }
+
+ class { 'backup::host':
+ sets => ['roothome', ]
+ }
}
node 'mexia.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/81674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibba57ee0721ec1e3cf14490826469a6ac0a38455
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Akosiaris <[email protected]>
Gerrit-Reviewer: Akosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
