Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/325728
Change subject: install: (re)move remaining "role::installserver"
......................................................................
install: (re)move remaining "role::installserver"
Now that all other things have been split out of
role::installserver and moved, all that remains is
the preseed stuff. Creating the directory, populating
it and adding backup for it. Move that into ::preseed.
Add the "include standard" in all subclasses and finally be
done and the old class that did everything at once is now gone,
while still no-op on carbon etc and classes can be moved around.
Bug: T132757
Change-Id: I520e29c9a89f138d1a7650179725156c82fb8243
---
M manifests/site.pp
M modules/role/manifests/installserver/dhcp.pp
M modules/role/manifests/installserver/http.pp
R modules/role/manifests/installserver/preseed.pp
M modules/role/manifests/installserver/proxy.pp
M modules/role/manifests/installserver/tftp.pp
6 files changed, 8 insertions(+), 3 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/325728/1
diff --git a/manifests/site.pp b/manifests/site.pp
index 8b62305..0083b03 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -227,11 +227,11 @@
# DHCP / TFTP
node 'carbon.wikimedia.org' {
- role(installserver,
- installserver::tftp,
+ role(installserver::tftp,
installserver::dhcp,
installserver::http,
installserver::proxy,
+ installserver::preseed,
aptrepo::wikimedia)
$cluster = 'misc'
diff --git a/modules/role/manifests/installserver/dhcp.pp
b/modules/role/manifests/installserver/dhcp.pp
index d76db32..2112d1e 100644
--- a/modules/role/manifests/installserver/dhcp.pp
+++ b/modules/role/manifests/installserver/dhcp.pp
@@ -7,6 +7,7 @@
include install_server::dhcp_server
+ include standard
include base::firewall
ferm::rule { 'dhcp':
diff --git a/modules/role/manifests/installserver/http.pp
b/modules/role/manifests/installserver/http.pp
index 271cb3e..1ae4fa4 100644
--- a/modules/role/manifests/installserver/http.pp
+++ b/modules/role/manifests/installserver/http.pp
@@ -7,6 +7,7 @@
include install_server::web_server
+ include standard
include base::firewall
ferm::service { 'install_http':
diff --git a/modules/role/manifests/installserver.pp
b/modules/role/manifests/installserver/preseed.pp
similarity index 66%
rename from modules/role/manifests/installserver.pp
rename to modules/role/manifests/installserver/preseed.pp
index 0cf77e7..66a80ca 100644
--- a/modules/role/manifests/installserver.pp
+++ b/modules/role/manifests/installserver/preseed.pp
@@ -1,4 +1,5 @@
-class role::installserver {
+# sets up preseeding dir and config on an install server
+class role::installserver::preseed {
include standard
include role::backup::host
diff --git a/modules/role/manifests/installserver/proxy.pp
b/modules/role/manifests/installserver/proxy.pp
index a5c5dd4..08533a5 100644
--- a/modules/role/manifests/installserver/proxy.pp
+++ b/modules/role/manifests/installserver/proxy.pp
@@ -19,6 +19,7 @@
minute => '15',
}
+ include standard
include base::firewall
ferm::service { 'proxy':
diff --git a/modules/role/manifests/installserver/tftp.pp
b/modules/role/manifests/installserver/tftp.pp
index ce21e0b..d81d0b2 100644
--- a/modules/role/manifests/installserver/tftp.pp
+++ b/modules/role/manifests/installserver/tftp.pp
@@ -22,6 +22,7 @@
description => 'WMF TFTP server',
}
+ include standard
include base::firewall
include role::backup::host
include install_server::tftp_server
--
To view, visit https://gerrit.wikimedia.org/r/325728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I520e29c9a89f138d1a7650179725156c82fb8243
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
