Dzahn has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/399704 )
Change subject: labs::nfs: move standard includes from site to roles
......................................................................
labs::nfs: move standard includes from site to roles
This should be no-oop on everything but cleans up site.pp
and fixes a couple style violations (for including standard
in site).
Change-Id: I8fcf7bcf75500df92421915d5b47e99d3053834f
---
M manifests/site.pp
M modules/role/manifests/labs/nfs/misc.pp
M modules/role/manifests/labs/nfs/secondary.pp
M modules/role/manifests/labs/nfs/secondary_backup/misc.pp
M modules/role/manifests/labs/nfs/secondary_backup/tools.pp
5 files changed, 4 insertions(+), 4 deletions(-)
Approvals:
Giuseppe Lavagetto: Looks good to me, but someone else must approve
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index 2205aa3..49a604b 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1187,14 +1187,12 @@
node 'labstore1003.eqiad.wmnet' {
role(labs::nfs::misc)
- include ::standard
# Do not enable yet
# include ::base::firewall
}
node /labstore100[45]\.eqiad\.wmnet/ {
role(labs::nfs::secondary)
- include ::standard
# Do not enable yet
# include ::base::firewall
}
@@ -1211,14 +1209,12 @@
node 'labstore2003.codfw.wmnet' {
role(labs::nfs::secondary_backup::tools)
- include ::standard
# Do not enable yet
# include ::base::firewall
}
node 'labstore2004.codfw.wmnet' {
role(labs::nfs::secondary_backup::misc)
- include ::standard
# Do not enable yet
# include ::base::firewall
}
diff --git a/modules/role/manifests/labs/nfs/misc.pp
b/modules/role/manifests/labs/nfs/misc.pp
index 47972b3..b739f53 100644
--- a/modules/role/manifests/labs/nfs/misc.pp
+++ b/modules/role/manifests/labs/nfs/misc.pp
@@ -13,6 +13,7 @@
description => 'Labs NFS service (misc)',
}
+ include ::standard
include labstore
include rsync::server
include labstore::backup_keys
diff --git a/modules/role/manifests/labs/nfs/secondary.pp
b/modules/role/manifests/labs/nfs/secondary.pp
index 36920d0..36c3d10 100644
--- a/modules/role/manifests/labs/nfs/secondary.pp
+++ b/modules/role/manifests/labs/nfs/secondary.pp
@@ -8,6 +8,7 @@
description => 'NFS secondary share cluster',
}
+ include ::standard
require ::profile::openstack::main::clientlib
require ::profile::openstack::main::observerenv
include labstore::fileserver::secondary
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
index cd910bd..ceb2766 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/misc.pp
@@ -1,5 +1,6 @@
class role::labs::nfs::secondary_backup::misc {
+ include ::standard
include role::labs::nfs::secondary_backup::base
file { '/srv/backup/misc':
diff --git a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
index fd7c4c5..827c7fd 100644
--- a/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
+++ b/modules/role/manifests/labs/nfs/secondary_backup/tools.pp
@@ -1,5 +1,6 @@
class role::labs::nfs::secondary_backup::tools {
+ include ::standard
include role::labs::nfs::secondary_backup::base
file { '/srv/backup/tools':
--
To view, visit https://gerrit.wikimedia.org/r/399704
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8fcf7bcf75500df92421915d5b47e99d3053834f
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Giuseppe Lavagetto <glavage...@wikimedia.org>
Gerrit-Reviewer: Madhuvishy <mviswanat...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
