Dzahn has submitted this change and it was merged.
Change subject: backup home dirs on bastion hosts per role
......................................................................
backup home dirs on bastion hosts per role
It should be a property of the role bastionhost that home
directories are being backed up.
As opposed to indidivual hosts (but not all) having it added in site.pp
Change-Id: Ie0129346e9116520caacadb63f0e63fa08aa9fbf
---
M manifests/role/bastionhost.pp
M manifests/site.pp
2 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/bastionhost.pp b/manifests/role/bastionhost.pp
index 55e82ee..d2ab0dd 100644
--- a/manifests/role/bastionhost.pp
+++ b/manifests/role/bastionhost.pp
@@ -6,6 +6,9 @@
include ::bastionhost
include base::firewall
+ include role::backup::host
+
+ backup::set {'home': }
ferm::service { 'ssh':
desc => 'SSH open from everywhere, this is a bastion host',
@@ -13,4 +16,5 @@
proto => 'tcp',
port => 'ssh',
}
+
}
diff --git a/manifests/site.pp b/manifests/site.pp
index 53e343f..4f9f52d 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -248,8 +248,6 @@
mountpoint => '/srv/home_pmtpa',
mount_site => 'pmtpa',
}
- include role::backup::host
- backup::set {'home': }
}
node 'bast2001.wikimedia.org' {
@@ -1140,8 +1138,6 @@
include standard
include role::ipmi
include role::access_new_install
- include role::backup::host
- backup::set {'home': }
}
node 'labcontrol1001.wikimedia.org' {
--
To view, visit https://gerrit.wikimedia.org/r/220657
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie0129346e9116520caacadb63f0e63fa08aa9fbf
Gerrit-PatchSet: 6
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
