Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284809
Change subject: install_server: move mirrors stuff to own role
......................................................................
install_server: move mirrors stuff to own role
Move the mirrors things to a separate role, like the comment
said to do. WIP
Bug:T132757
Change-Id: I9beae993d59618ea080314ca67e7457683eff984
---
M manifests/role/installserver.pp
A modules/role/manifests/installserver/mirrors.pp
2 files changed, 16 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/09/284809/1
diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index 3c4f579..64f2590 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -30,22 +30,9 @@
include base::firewall
include role::backup::host
+ include role::installserver::mirrors
include install_server::apt_repository
include install_server::preseed_server
-
- # mirrors stuff. these should be moved to their own role class eventually
- include mirrors::serve
- include mirrors::ubuntu
- nrpe::monitor_service {'check_ubuntu_mirror':
- description => 'Ubuntu mirror in sync with upstream',
- nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror
/srv/mirrors/ubuntu',
- }
-
- include mirrors::debian
- nrpe::monitor_service {'check_debian_mirror':
- description => 'Debian mirror in sync with upstream',
- nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror
/srv/mirrors/debian',
- }
include install_server::tftp_server
ferm::rule { 'tftp':
diff --git a/modules/role/manifests/installserver/mirrors.pp
b/modules/role/manifests/installserver/mirrors.pp
new file mode 100644
index 0000000..9bffa00
--- /dev/null
+++ b/modules/role/manifests/installserver/mirrors.pp
@@ -0,0 +1,15 @@
+class role::installserver::mirrors {
+
+ include mirrors::serve
+ include mirrors::ubuntu
+ nrpe::monitor_service {'check_ubuntu_mirror':
+ description => 'Ubuntu mirror in sync with upstream',
+ nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror
/srv/mirrors/ubuntu',
+ }
+
+ include mirrors::debian
+ nrpe::monitor_service {'check_debian_mirror':
+ description => 'Debian mirror in sync with upstream',
+ nrpe_command => '/usr/local/lib/nagios/plugins/check_apt_mirror
/srv/mirrors/debian',
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/284809
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I9beae993d59618ea080314ca67e7457683eff984
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
