Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325720
Change subject: installserver: move firewall include to http/proxy classes
......................................................................
installserver: move firewall include to http/proxy classes
Remove the "base::firewall" include from the old global
installserver role that we are removing.
Add it instead to all the classes that we split out from that.
This is the most flexible. Roles can be moved around without breaking
firewalling/ferm.
The other 2 installserver roles for dhcp and tftp already have it,
just also adding it in http and proxy.
Bug: T132757
Change-Id: If06d7c54a56ad53a87e8ff9db180864d7e5089d7
---
M modules/role/manifests/installserver.pp
M modules/role/manifests/installserver/http.pp
M modules/role/manifests/installserver/proxy.pp
3 files changed, 4 insertions(+), 22 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/20/325720/1
diff --git a/modules/role/manifests/installserver.pp
b/modules/role/manifests/installserver.pp
index 1b41bed..e80d974 100644
--- a/modules/role/manifests/installserver.pp
+++ b/modules/role/manifests/installserver.pp
@@ -1,24 +1,3 @@
-# Class: role::installserver
-#
-# A WMF role class used to install all the install_server stuff
-#
-# Parameters:
-#
-# Actions:
-# Install and configure all needed software to have an installation
server
-# ready
-#
-# Requires:
-#
-# Class['install_server::preseed_server']
-# Class['install_server::web_server']
-# Define['backup::set']
-# Class['base::firewall']
-# Define['ferm::service']
-#
-# Sample Usage:
-# include role::installserver
-
class role::installserver {
system::role { 'role::install_server':
description => 'WMF Install server. APT repo, Forward Caching, TFTP, \
@@ -26,7 +5,6 @@
}
include standard
- include base::firewall
include role::backup::host
include install_server::preseed_server
diff --git a/modules/role/manifests/installserver/http.pp
b/modules/role/manifests/installserver/http.pp
index 5645201..271cb3e 100644
--- a/modules/role/manifests/installserver/http.pp
+++ b/modules/role/manifests/installserver/http.pp
@@ -7,6 +7,8 @@
include install_server::web_server
+ include base::firewall
+
ferm::service { 'install_http':
proto => 'tcp',
port => '(http https)'
diff --git a/modules/role/manifests/installserver/proxy.pp
b/modules/role/manifests/installserver/proxy.pp
index da9a3b1..a5c5dd4 100644
--- a/modules/role/manifests/installserver/proxy.pp
+++ b/modules/role/manifests/installserver/proxy.pp
@@ -19,6 +19,8 @@
minute => '15',
}
+ include base::firewall
+
ferm::service { 'proxy':
proto => 'tcp',
port => '8080',
--
To view, visit https://gerrit.wikimedia.org/r/325720
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If06d7c54a56ad53a87e8ff9db180864d7e5089d7
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
