Alexandros Kosiaris has submitted this change and it was merged.
Change subject: Migrate to new install-server module
......................................................................
Migrate to new install-server module
carbon and brewster just migrate to the new role class, the rest use the
newly introduced role::install-server::tftp-server
Change-Id: I83f58e73a24eaf46fbdc48c4c1e23108e8d44e27
---
M manifests/role/install-server.pp
M manifests/site.pp
2 files changed, 36 insertions(+), 4 deletions(-)
Approvals:
Alexandros Kosiaris: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/install-server.pp b/manifests/role/install-server.pp
index 6a34b81..4f4b03c 100644
--- a/manifests/role/install-server.pp
+++ b/manifests/role/install-server.pp
@@ -69,3 +69,35 @@
check_command => 'check_http',
}
}
+
+# Class: role::install-server::tftp-server
+#
+# A WMF role class used to install all the install-server TFTP stuff
+#
+# Parameters:
+#
+# Actions:
+# Install and configure all needed software to have an installation
server
+# TFTP server ready
+#
+# Requires:
+#
+# Class['install-server::tftp-server']
+# Class['ferm']
+# Define['ferm::rule']
+#
+# Sample Usage:
+# include role::install-server::tftp-server
+
+class role::install-server::tftp-server {
+ system::role { 'role::install-server::tftp-server':
+ description => 'WMF TFTP server',
+ }
+
+ include ferm
+ include install-server::tftp-server
+
+ ferm::rule { 'tftp':
+ rule => 'proto tcp dport tftp { saddr $ALL_NETWORKS ACCEPT; }'
+ }
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 8dac784..3145db3 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -290,7 +290,7 @@
include standard,
admins::roots,
misc::management::ipmi,
- misc::install-server::tftp-server
+ role::install-server::tftp-server
}
@@ -307,7 +307,7 @@
$tftpboot_server_type = 'master'
include standard,
- misc::install-server,
+ role::install-server,
backup::client
# set up brewster to use haproxy to proxy puppet
@@ -337,7 +337,7 @@
include standard,
backup::client,
- misc::install-server::tftp-server
+ role::install-server
}
# cerium,praseodymium, ruthenium and xenon are cassandra test host
@@ -1135,7 +1135,7 @@
$domain_search = "esams.wikimedia.org wikimedia.org esams.wmnet"
include standard,
- misc::install-server::tftp-server,
+ role::install-server::tftp-server,
admins::roots,
admins::mortals,
admins::restricted
--
To view, visit https://gerrit.wikimedia.org/r/101182
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I83f58e73a24eaf46fbdc48c4c1e23108e8d44e27
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
