Dzahn has submitted this change and it was merged.
Change subject: installserver: move http to own class (kill carbon WIP)
......................................................................
installserver: move http to own class (kill carbon WIP)
Split out the http part from the installserver role,
add it back to carbon the only user of the traditional
installserver role.
Goal is to remove the old role entirely while staying no-op
on carbon.
Bug: T132757
Change-Id: Ibdb9687ae18f740e30c7ca501bce88106c9294a2
---
M manifests/site.pp
M modules/role/manifests/installserver.pp
A modules/role/manifests/installserver/http.pp
3 files changed, 25 insertions(+), 11 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/site.pp b/manifests/site.pp
index d5a3f47..14ddba2 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -223,8 +223,12 @@
# DHCP / TFTP
node 'carbon.wikimedia.org' {
- role(installserver, installserver::tftp_server, installserver::dhcp,
+ role(installserver,
+ installserver::tftp_server,
+ installserver::dhcp,
+ installserver::http,
aptrepo::wikimedia)
+
$cluster = 'misc'
interface::add_ip6_mapped { 'main':
diff --git a/modules/role/manifests/installserver.pp
b/modules/role/manifests/installserver.pp
index db7b75a..3c93294 100644
--- a/modules/role/manifests/installserver.pp
+++ b/modules/role/manifests/installserver.pp
@@ -54,12 +54,6 @@
srange => '$PRODUCTION_NETWORKS',
}
- include install_server::web_server
- ferm::service { 'install_http':
- proto => 'tcp',
- port => '(http https)'
- }
-
# Backup
$sets = [ 'srv-autoinstall',
]
@@ -69,9 +63,5 @@
monitoring::service { 'squid':
description => 'Squid',
check_command => 'check_tcp!8080',
- }
- monitoring::service { 'http':
- description => 'HTTP',
- check_command => 'check_http',
}
}
diff --git a/modules/role/manifests/installserver/http.pp
b/modules/role/manifests/installserver/http.pp
new file mode 100644
index 0000000..5645201
--- /dev/null
+++ b/modules/role/manifests/installserver/http.pp
@@ -0,0 +1,20 @@
+# Installs a web server for the install server
+class role::installserver::http {
+
+ system::role { 'role::installserver::http':
+ description => 'WMF install HTTP server',
+ }
+
+ include install_server::web_server
+
+ ferm::service { 'install_http':
+ proto => 'tcp',
+ port => '(http https)'
+ }
+
+ monitoring::service { 'http':
+ description => 'HTTP',
+ check_command => 'check_http',
+ }
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/322829
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibdb9687ae18f740e30c7ca501bce88106c9294a2
Gerrit-PatchSet: 6
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <[email protected]>
Gerrit-Reviewer: Dzahn <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
