Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96415
Change subject: role classes for download servers
......................................................................
role classes for download servers
instead of including so much in site.pp
separate those into common things included
on all download servers and 2 roles for
primary and secondary
also fixing system role definitions that have
changed since it was moved to module
Change-Id: Ib171af3c2b4c300b5416fd086c40c27342f7578b
---
A manifests/role/download.pp
M manifests/site.pp
M modules/download/manifests/gluster.pp
M modules/download/manifests/mediawiki.pp
M modules/download/manifests/mirror.pp
M modules/download/manifests/primary.pp
M modules/download/manifests/wikimedia.pp
7 files changed, 44 insertions(+), 19 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/15/96415/1
diff --git a/manifests/role/download.pp b/manifests/role/download.pp
new file mode 100644
index 0000000..7af4920
--- /dev/null
+++ b/manifests/role/download.pp
@@ -0,0 +1,35 @@
+# role classes for download servers
+
+# common classes included by all download servers
+class role::download::common {
+
+ include download,
+ standard,
+ admins::roots,
+ groups::wikidev,
+ accounts::catrope
+
+}
+
+# additional classes on a primary server
+class role::download::primary {
+
+ system::role { 'role::download::primary': description => 'primary download
server' }
+
+ include role::download::common,
+ download::primary,
+ download::kiwix
+
+}
+
+# additional classes on a secondary server
+class role::download::secondary {
+
+ system::role { 'role::download::primary': description => 'secondary
download server' }
+
+ include role::download::common,
+ download::mirror,
+ download::gluster
+
+
+}
diff --git a/manifests/site.pp b/manifests/site.pp
index 468e455..d3d7a7c 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -529,26 +529,16 @@
node "dataset2.wikimedia.org" {
$cluster = "misc"
$gid=500
- include standard,
- admins::roots,
- groups::wikidev,
- accounts::catrope,
- download,
- download::primary,
- download::kiwix
+
+ include role::download::primary
}
node "dataset1001.wikimedia.org" {
$cluster = "misc"
$gid=500
interface::aggregate { "bond0": orig_interface => "eth0", members => [
"eth0", "eth1" ] }
- include standard,
- admins::roots,
- groups::wikidev,
- accounts::catrope,
- download,
- download::mirror,
- download::gluster
+
+ include role::download::secondary
}
# pmtpa dbs
diff --git a/modules/download/manifests/gluster.pp
b/modules/download/manifests/gluster.pp
index 8df0b55..7495e69 100644
--- a/modules/download/manifests/gluster.pp
+++ b/modules/download/manifests/gluster.pp
@@ -2,7 +2,7 @@
include role::mirror::common
include gluster::client
- system::role { "download-gluster": description => "Gluster dumps copy" }
+ system::role { "download::gluster": description => "Gluster dumps copy" }
mount { '/mnt/glusterpublicdata':
ensure => mounted,
diff --git a/modules/download/manifests/mediawiki.pp
b/modules/download/manifests/mediawiki.pp
index 699eae8..e2506d8 100644
--- a/modules/download/manifests/mediawiki.pp
+++ b/modules/download/manifests/mediawiki.pp
@@ -1,6 +1,6 @@
class download::mediawiki {
- system::role { "download-mediawiki": description => "MediaWiki download" }
+ system::role { "download::mediawiki": description => "MediaWiki download" }
package { 'apache':
ensure => present,
diff --git a/modules/download/manifests/mirror.pp
b/modules/download/manifests/mirror.pp
index 98da4c4..85410c0 100644
--- a/modules/download/manifests/mirror.pp
+++ b/modules/download/manifests/mirror.pp
@@ -1,5 +1,5 @@
class download::mirror {
- system::role { "download-mirror": description => "Service for rsync to
external download mirrors" }
+ system::role { "download::mirror": description => "Service for rsync to
external download mirrors" }
include role::mirror::common
diff --git a/modules/download/manifests/primary.pp
b/modules/download/manifests/primary.pp
index 6a87156..466cf60 100644
--- a/modules/download/manifests/primary.pp
+++ b/modules/download/manifests/primary.pp
@@ -1,5 +1,5 @@
class download::primary {
- system::role { "download-primary": description => "Service for rsync to
internal download mirrors" }
+ system::role { "download::primary": description => "Service for rsync to
internal download mirrors" }
include role::mirror::common
diff --git a/modules/download/manifests/wikimedia.pp
b/modules/download/manifests/wikimedia.pp
index 35ba592..931f702 100644
--- a/modules/download/manifests/wikimedia.pp
+++ b/modules/download/manifests/wikimedia.pp
@@ -1,5 +1,5 @@
class download::wikimedia {
- system::role { "download-wikimedia": description =>
"download.wikimedia.org" }
+ system::role { "download::wikimedia": description =>
"download.wikimedia.org" }
package { 'lighttpd':
ensure => latest;
--
To view, visit https://gerrit.wikimedia.org/r/96415
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib171af3c2b4c300b5416fd086c40c27342f7578b
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
