Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/284763
Change subject: install_server: split out reprepro role (WIP)
......................................................................
install_server: split out reprepro role (WIP)
Split the reprepro role out of the install_server module
as Faidon said on T132757. (WIP)
Bug:T132757
Change-Id: Ie259b939971a5affed178ed25c31373de1110e57
---
M manifests/role/installserver.pp
M manifests/site.pp
R modules/reprepro/files/distributions
R modules/reprepro/files/incoming
R modules/reprepro/files/log
R modules/reprepro/files/updates
R modules/reprepro/manifests/apt_repository.pp
A modules/role/manifests/reprepro/apt_repository.pp
8 files changed, 13 insertions(+), 10 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/63/284763/1
diff --git a/manifests/role/installserver.pp b/manifests/role/installserver.pp
index 3c4f579..9b6f848 100644
--- a/manifests/role/installserver.pp
+++ b/manifests/role/installserver.pp
@@ -10,7 +10,6 @@
#
# Requires:
#
-# Class['install_server::apt_repository']
# Class['install_server::preseed_server']
# Class['install_server::tftp_server']
# Class['install_server::web_server']
@@ -30,7 +29,6 @@
include base::firewall
include role::backup::host
- include install_server::apt_repository
include install_server::preseed_server
# mirrors stuff. these should be moved to their own role class eventually
diff --git a/manifests/site.pp b/manifests/site.pp
index 961b30d..14b4524 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -236,7 +236,7 @@
# DHCP / TFTP
node 'carbon.wikimedia.org' {
- role installserver
+ role installserver, reprepro::apt_repository
$cluster = 'misc'
interface::add_ip6_mapped { 'main':
diff --git a/modules/install_server/files/reprepro/distributions
b/modules/reprepro/files/distributions
similarity index 100%
rename from modules/install_server/files/reprepro/distributions
rename to modules/reprepro/files/distributions
diff --git a/modules/install_server/files/reprepro/incoming
b/modules/reprepro/files/incoming
similarity index 100%
rename from modules/install_server/files/reprepro/incoming
rename to modules/reprepro/files/incoming
diff --git a/modules/install_server/files/reprepro/log
b/modules/reprepro/files/log
similarity index 100%
rename from modules/install_server/files/reprepro/log
rename to modules/reprepro/files/log
diff --git a/modules/install_server/files/reprepro/updates
b/modules/reprepro/files/updates
similarity index 100%
rename from modules/install_server/files/reprepro/updates
rename to modules/reprepro/files/updates
diff --git a/modules/install_server/manifests/apt_repository.pp
b/modules/reprepro/manifests/apt_repository.pp
similarity index 76%
rename from modules/install_server/manifests/apt_repository.pp
rename to modules/reprepro/manifests/apt_repository.pp
index 4c36c7f..115672f 100644
--- a/modules/install_server/manifests/apt_repository.pp
+++ b/modules/reprepro/manifests/apt_repository.pp
@@ -1,4 +1,4 @@
-# Class: install_server::apt_repository
+# Class: reprepro::apt_repository
#
# This class installs apt repository managements tools
#
@@ -10,9 +10,9 @@
# Requires:
#
# Sample Usage:
-# include install_server::apt_repository
+# include reprepro::apt_repository
-class install_server::apt_repository {
+class reprepro::apt_repository {
package { [
'dpkg-dev',
'dctrl-tools',
@@ -44,27 +44,27 @@
mode => '0755',
owner => 'root',
group => 'root',
- source => 'puppet:///modules/install_server/reprepro/log',
+ source => 'puppet:///modules/reprepro/log',
}
file { '/srv/wikimedia/conf/distributions':
ensure => present,
mode => '0444',
owner => 'root',
group => 'root',
- source => 'puppet:///modules/install_server/reprepro/distributions',
+ source => 'puppet:///modules/reprepro/distributions',
}
file { '/srv/wikimedia/conf/updates':
ensure => present,
mode => '0444',
owner => 'root',
group => 'root',
- source => 'puppet:///modules/install_server/reprepro/updates',
+ source => 'puppet:///modules/reprepro/updates',
}
file { '/srv/wikimedia/conf/incoming':
ensure => present,
mode => '0444',
owner => 'root',
group => 'root',
- source => 'puppet:///modules/install_server/reprepro/incoming',
+ source => 'puppet:///modules/reprepro/incoming',
}
}
diff --git a/modules/role/manifests/reprepro/apt_repository.pp
b/modules/role/manifests/reprepro/apt_repository.pp
new file mode 100644
index 0000000..52dbda2
--- /dev/null
+++ b/modules/role/manifests/reprepro/apt_repository.pp
@@ -0,0 +1,5 @@
+class role::reprepro::apt_repository {
+
+ include ::reprepro::apt_repository
+
+}
--
To view, visit https://gerrit.wikimedia.org/r/284763
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie259b939971a5affed178ed25c31373de1110e57
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
