Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/315886
Change subject: lists::server: simplify includes on node level
......................................................................
lists::server: simplify includes on node level
- base::firewall is already included in the role, duplicate
- move standard from node to role
- simplify site.pp / mapped IPv6 address
Change-Id: I08b42d746f660209f83f85cd8abf172200e2a8f1
---
M manifests/site.pp
M modules/role/manifests/lists/server.pp
2 files changed, 2 insertions(+), 6 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/86/315886/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 6b7f891..37a4759 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1085,12 +1085,7 @@
# virtual machine for mailman list server
node 'fermium.wikimedia.org' {
role(lists::server)
- include standard
- include admin
-
- interface::add_ip6_mapped { 'main':
- interface => 'eth0',
- }
+ interface::add_ip6_mapped { 'main': }
}
node 'fluorine.eqiad.wmnet' {
diff --git a/modules/role/manifests/lists/server.pp
b/modules/role/manifests/lists/server.pp
index b6ef2c4..78ec10d 100644
--- a/modules/role/manifests/lists/server.pp
+++ b/modules/role/manifests/lists/server.pp
@@ -1,6 +1,7 @@
class role::lists::server {
include network::constants
include base::firewall
+ include standard
system::role { 'role::lists::server':
description => 'Mailing list server',
--
To view, visit https://gerrit.wikimedia.org/r/315886
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I08b42d746f660209f83f85cd8abf172200e2a8f1
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
