Dzahn has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/327693 )
Change subject: contint: simplify includes in site.pp, move things to master
role
......................................................................
contint: simplify includes in site.pp, move things to master role
Move includes of "standard", "backup", IPv6 all away from the node
level into the role level. All these are general features of a
contint::master now and we can simplify the includes in site.pp.
Bug: T150771
Change-Id: Ic1ad70f17893d51590fa50fcb2225622880e40e3
---
M manifests/site.pp
M modules/role/manifests/ci/master.pp
2 files changed, 7 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/93/327693/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 04bea22..d877b47 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -291,12 +291,7 @@
role(ci::master,
ci::slave,
ci::website,
- zuul::server,
- backup::host)
-
- include standard
- interface::add_ip6_mapped { 'main': interface => 'eth0', }
- include contint::firewall
+ zuul::server)
}
# Debian package/docker images building host in production
diff --git a/modules/role/manifests/ci/master.pp
b/modules/role/manifests/ci/master.pp
index b44760f..4ec1cde 100644
--- a/modules/role/manifests/ci/master.pp
+++ b/modules/role/manifests/ci/master.pp
@@ -19,8 +19,14 @@
include ::jenkins,
contint::proxy_jenkins
+ include role::backup::host
backup::set { 'contint' : }
+ include standard
+ interface::add_ip6_mapped { 'main': interface => 'eth0', }
+
+ include contint::firewall
+
# Nodepool spawn non ephemeral slaves which causes config-history plugin to
# fill up entries until it reaches the limit of 32k inodes. T126552
cron { 'tidy_jenkins_ephemeral_nodes_configs':
--
To view, visit https://gerrit.wikimedia.org/r/327693
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1ad70f17893d51590fa50fcb2225622880e40e3
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
