Dzahn has submitted this change and it was merged.
Change subject: install_server: move tftp role to autoloader layout
......................................................................
install_server: move tftp role to autoloader layout
Bug:T132757
Change-Id: I06c515c761e65d3f4c98d6d24c7c06fdf02e186a
---
M manifests/role/installserver.pp
A modules/role/manifests/installserver/tftp_server.pp
2 files changed, 31 insertions(+), 31 deletions(-)
Approvals:
jenkins-bot: Verified
Dzahn: Looks good to me, approved
diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index 3c4f579..7686649 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -107,34 +107,3 @@
}
}
-# 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['base::firewall']
-# Define['ferm::rule']
-#
-# Sample Usage:
-# include role::installserver::tftp_server
-
-class role::installserver::tftp_server {
- system::role { 'role::install_server::tftp_server':
- description => 'WMF TFTP server',
- }
-
- include base::firewall
- include install_server::tftp_server
-
- ferm::rule { 'tftp':
- rule => 'proto udp dport tftp { saddr $ALL_NETWORKS ACCEPT; }'
- }
-}
diff --git a/modules/role/manifests/installserver/tftp_server.pp
b/modules/role/manifests/installserver/tftp_server.pp
new file mode 100644
index 0000000..01aea22
--- /dev/null
+++ b/modules/role/manifests/installserver/tftp_server.pp
@@ -0,0 +1,31 @@
+# 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['base::firewall']
+# Define['ferm::rule']
+#
+# Sample Usage:
+# include role::installserver::tftp_server
+
+class role::installserver::tftp_server {
+ system::role { 'role::install_server::tftp_server':
+ description => 'WMF TFTP server',
+ }
+
+ include base::firewall
+ include install_server::tftp_server
+
+ ferm::rule { 'tftp':
+ rule => 'proto udp dport tftp { saddr $ALL_NETWORKS ACCEPT; }'
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/284793
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I06c515c761e65d3f4c98d6d24c7c06fdf02e186a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: Alexandros Kosiaris <akosia...@wikimedia.org>
Gerrit-Reviewer: Dzahn <dz...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
