Dzahn has submitted this change and it was merged.
Change subject: tin,mira: move standard to role class
......................................................................
tin,mira: move standard to role class
Change-Id: Ieabe37d0b565d171265a2693b08bbb0d4dd5e3a3
---
M manifests/site.pp
M modules/role/manifests/deployment/server.pp
2 files changed, 2 insertions(+), 2 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index d1ccc74..4f4ce5c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -2423,9 +2423,7 @@
# deployment servers
node 'tin.eqiad.wmnet', 'mira.codfw.wmnet' {
-
role deployment::server, labsdb::manager
- include standard
interface::add_ip6_mapped { 'main':
interface => 'eth0',
diff --git a/modules/role/manifests/deployment/server.pp
b/modules/role/manifests/deployment/server.pp
index ae84543..116b237 100644
--- a/modules/role/manifests/deployment/server.pp
+++ b/modules/role/manifests/deployment/server.pp
@@ -2,6 +2,8 @@
$apache_fqdn = $::fqdn,
$deployment_group = 'wikidev',
) {
+ include standard
+
# Can't include this while scap is present on the deployment server:
# include misc::deployment::scripts
include role::deployment::mediawiki
--
To view, visit https://gerrit.wikimedia.org/r/250103
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ieabe37d0b565d171265a2693b08bbb0d4dd5e3a3
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Muehlenhoff <mmuhlenh...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
