Dzahn has uploaded a new change for review.
https://gerrit.wikimedia.org/r/96413
Change subject: move dsh to module
......................................................................
move dsh to module
move misc::dsh to modules/dsh, incl. the group files,
separate the classes into their own files,
do puppet-lint cleanup like quoting and arrows
not sure if the dsh_groups definition (now dsh::groups) for
monitoring is used anywhere, compare checks in Icinga classes
Change-Id: I1e76911c79a8e465c33888fd91d1d921065bb8cd
---
D manifests/misc/dsh.pp
M manifests/site.pp
R modules/dsh/files/dsh.conf
R modules/dsh/files/group/ALL
R modules/dsh/files/group/ams
R modules/dsh/files/group/amssq
R modules/dsh/files/group/analytics
R modules/dsh/files/group/apache-eqiad
R modules/dsh/files/group/apaches
R modules/dsh/files/group/apaches-bits
R modules/dsh/files/group/api
R modules/dsh/files/group/bits
R modules/dsh/files/group/bits_esams
R modules/dsh/files/group/check_nodegroups.sh
R modules/dsh/files/group/cp1
R modules/dsh/files/group/db
R modules/dsh/files/group/eqiad.text
R modules/dsh/files/group/eqiad.upload
R modules/dsh/files/group/esams_ext_store
R modules/dsh/files/group/ext-store-masters
R modules/dsh/files/group/ext-stores
R modules/dsh/files/group/image_scalers
R modules/dsh/files/group/image_stores
R modules/dsh/files/group/job-runners
R modules/dsh/files/group/job-runners-eqiad
R modules/dsh/files/group/job-runners-pmtpa
R modules/dsh/files/group/job-runners.old
R modules/dsh/files/group/knams.text
R modules/dsh/files/group/knams.upload
R modules/dsh/files/group/knsq
R modules/dsh/files/group/lucene_eqiad
R modules/dsh/files/group/lucene_pmtpa
R modules/dsh/files/group/mc_eqiad
R modules/dsh/files/group/mc_pmtpa
R modules/dsh/files/group/mediawiki-installation
R modules/dsh/files/group/misc_eqiad
R modules/dsh/files/group/misc_esams
R modules/dsh/files/group/misc_frack
R modules/dsh/files/group/misc_pmtpa
R modules/dsh/files/group/misc_ulsfo
R modules/dsh/files/group/mobile
R modules/dsh/files/group/mw
R modules/dsh/files/group/mw-eqiad
R modules/dsh/files/group/mw-pmtpa
R modules/dsh/files/group/mysq
R modules/dsh/files/group/mysql
R modules/dsh/files/group/mysql-secondary
R modules/dsh/files/group/parsoid
R modules/dsh/files/group/pmtpa
R modules/dsh/files/group/pmtpa.text
R modules/dsh/files/group/pmtpa.upload
R modules/dsh/files/group/scap-proxies
R modules/dsh/files/group/search
R modules/dsh/files/group/search.eqiad
R modules/dsh/files/group/search_pmtpa
R modules/dsh/files/group/searchidx
R modules/dsh/files/group/snapshot
R modules/dsh/files/group/sq
R modules/dsh/files/group/sq.old
R modules/dsh/files/group/squids_eqiad_text
R modules/dsh/files/group/squids_esams_text
R modules/dsh/files/group/squids_knams
R modules/dsh/files/group/srv
R modules/dsh/files/group/ssl
R modules/dsh/files/group/testwikipedia
R modules/dsh/files/group/varnish-upload-eqiad
R modules/dsh/files/group/varnishncsa-all
A modules/dsh/manifests/files.pp
A modules/dsh/manifests/groups.pp
A modules/dsh/manifests/init.pp
70 files changed, 46 insertions(+), 41 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/13/96413/1
diff --git a/manifests/misc/dsh.pp b/manifests/misc/dsh.pp
deleted file mode 100644
index 8d5cd73..0000000
--- a/manifests/misc/dsh.pp
+++ /dev/null
@@ -1,39 +0,0 @@
-# Standard installation of dsh (Dancer's distributed shell)
-
-class misc::dsh {
- package { "dsh":
- ensure => present
- }
- include files
-
- class files {
- file {
- "/etc/dsh":
- ensure => directory,
- owner => root,
- group => root,
- mode => 0444;
- "/etc/dsh/group":
- owner => root,
- group => root,
- mode => 0444,
- source => "puppet:///files/dsh/group",
- recurse => true;
- "/etc/dsh/dsh.conf":
- owner => root,
- group => root,
- mode => 0444,
- source => "puppet:///files/dsh/dsh.conf";
- }
- }
-}
-
-# Checks that this host belongs to dsh group(s)
-define dsh_groups( $groups = [] ) {
- $groups_string = join( $groups, ' ' )
-
- monitor_service { "dsh":
- description => 'dsh groups',
- check_command => "check_dsh_groups!$groups_string",
- }
-}
diff --git a/manifests/site.pp b/manifests/site.pp
index 468e455..50bb160 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -271,7 +271,7 @@
bastionhost,
nrpe,
nfs::netapp::home::othersite,
- misc::dsh,
+ dsh,
ssh::hostkeys-collect
}
@@ -987,7 +987,7 @@
accounts::awjrichards,
accounts::erosen,
generic::wikidev-umask,
- misc::dsh,
+ dsh,
ssh::hostkeys-collect
install_certificate{ "star.wikimedia.org": }
}
diff --git a/files/dsh/dsh.conf b/modules/dsh/files/dsh.conf
similarity index 100%
rename from files/dsh/dsh.conf
rename to modules/dsh/files/dsh.conf
diff --git a/files/dsh/group/ALL b/modules/dsh/files/group/ALL
similarity index 100%
rename from files/dsh/group/ALL
rename to modules/dsh/files/group/ALL
diff --git a/files/dsh/group/ams b/modules/dsh/files/group/ams
similarity index 100%
rename from files/dsh/group/ams
rename to modules/dsh/files/group/ams
diff --git a/files/dsh/group/amssq b/modules/dsh/files/group/amssq
similarity index 100%
rename from files/dsh/group/amssq
rename to modules/dsh/files/group/amssq
diff --git a/files/dsh/group/analytics b/modules/dsh/files/group/analytics
similarity index 100%
rename from files/dsh/group/analytics
rename to modules/dsh/files/group/analytics
diff --git a/files/dsh/group/apache-eqiad b/modules/dsh/files/group/apache-eqiad
similarity index 100%
rename from files/dsh/group/apache-eqiad
rename to modules/dsh/files/group/apache-eqiad
diff --git a/files/dsh/group/apaches b/modules/dsh/files/group/apaches
similarity index 100%
rename from files/dsh/group/apaches
rename to modules/dsh/files/group/apaches
diff --git a/files/dsh/group/apaches-bits b/modules/dsh/files/group/apaches-bits
similarity index 100%
rename from files/dsh/group/apaches-bits
rename to modules/dsh/files/group/apaches-bits
diff --git a/files/dsh/group/api b/modules/dsh/files/group/api
similarity index 100%
rename from files/dsh/group/api
rename to modules/dsh/files/group/api
diff --git a/files/dsh/group/bits b/modules/dsh/files/group/bits
similarity index 100%
rename from files/dsh/group/bits
rename to modules/dsh/files/group/bits
diff --git a/files/dsh/group/bits_esams b/modules/dsh/files/group/bits_esams
similarity index 100%
rename from files/dsh/group/bits_esams
rename to modules/dsh/files/group/bits_esams
diff --git a/files/dsh/group/check_nodegroups.sh
b/modules/dsh/files/group/check_nodegroups.sh
similarity index 100%
rename from files/dsh/group/check_nodegroups.sh
rename to modules/dsh/files/group/check_nodegroups.sh
diff --git a/files/dsh/group/cp1 b/modules/dsh/files/group/cp1
similarity index 100%
rename from files/dsh/group/cp1
rename to modules/dsh/files/group/cp1
diff --git a/files/dsh/group/db b/modules/dsh/files/group/db
similarity index 100%
rename from files/dsh/group/db
rename to modules/dsh/files/group/db
diff --git a/files/dsh/group/eqiad.text b/modules/dsh/files/group/eqiad.text
similarity index 100%
rename from files/dsh/group/eqiad.text
rename to modules/dsh/files/group/eqiad.text
diff --git a/files/dsh/group/eqiad.upload b/modules/dsh/files/group/eqiad.upload
similarity index 100%
rename from files/dsh/group/eqiad.upload
rename to modules/dsh/files/group/eqiad.upload
diff --git a/files/dsh/group/esams_ext_store
b/modules/dsh/files/group/esams_ext_store
similarity index 100%
rename from files/dsh/group/esams_ext_store
rename to modules/dsh/files/group/esams_ext_store
diff --git a/files/dsh/group/ext-store-masters
b/modules/dsh/files/group/ext-store-masters
similarity index 100%
rename from files/dsh/group/ext-store-masters
rename to modules/dsh/files/group/ext-store-masters
diff --git a/files/dsh/group/ext-stores b/modules/dsh/files/group/ext-stores
similarity index 100%
rename from files/dsh/group/ext-stores
rename to modules/dsh/files/group/ext-stores
diff --git a/files/dsh/group/image_scalers
b/modules/dsh/files/group/image_scalers
similarity index 100%
rename from files/dsh/group/image_scalers
rename to modules/dsh/files/group/image_scalers
diff --git a/files/dsh/group/image_stores b/modules/dsh/files/group/image_stores
similarity index 100%
rename from files/dsh/group/image_stores
rename to modules/dsh/files/group/image_stores
diff --git a/files/dsh/group/job-runners b/modules/dsh/files/group/job-runners
similarity index 100%
rename from files/dsh/group/job-runners
rename to modules/dsh/files/group/job-runners
diff --git a/files/dsh/group/job-runners-eqiad
b/modules/dsh/files/group/job-runners-eqiad
similarity index 100%
rename from files/dsh/group/job-runners-eqiad
rename to modules/dsh/files/group/job-runners-eqiad
diff --git a/files/dsh/group/job-runners-pmtpa
b/modules/dsh/files/group/job-runners-pmtpa
similarity index 100%
rename from files/dsh/group/job-runners-pmtpa
rename to modules/dsh/files/group/job-runners-pmtpa
diff --git a/files/dsh/group/job-runners.old
b/modules/dsh/files/group/job-runners.old
similarity index 100%
rename from files/dsh/group/job-runners.old
rename to modules/dsh/files/group/job-runners.old
diff --git a/files/dsh/group/knams.text b/modules/dsh/files/group/knams.text
similarity index 100%
rename from files/dsh/group/knams.text
rename to modules/dsh/files/group/knams.text
diff --git a/files/dsh/group/knams.upload b/modules/dsh/files/group/knams.upload
similarity index 100%
rename from files/dsh/group/knams.upload
rename to modules/dsh/files/group/knams.upload
diff --git a/files/dsh/group/knsq b/modules/dsh/files/group/knsq
similarity index 100%
rename from files/dsh/group/knsq
rename to modules/dsh/files/group/knsq
diff --git a/files/dsh/group/lucene_eqiad b/modules/dsh/files/group/lucene_eqiad
similarity index 100%
rename from files/dsh/group/lucene_eqiad
rename to modules/dsh/files/group/lucene_eqiad
diff --git a/files/dsh/group/lucene_pmtpa b/modules/dsh/files/group/lucene_pmtpa
similarity index 100%
rename from files/dsh/group/lucene_pmtpa
rename to modules/dsh/files/group/lucene_pmtpa
diff --git a/files/dsh/group/mc_eqiad b/modules/dsh/files/group/mc_eqiad
similarity index 100%
rename from files/dsh/group/mc_eqiad
rename to modules/dsh/files/group/mc_eqiad
diff --git a/files/dsh/group/mc_pmtpa b/modules/dsh/files/group/mc_pmtpa
similarity index 100%
rename from files/dsh/group/mc_pmtpa
rename to modules/dsh/files/group/mc_pmtpa
diff --git a/files/dsh/group/mediawiki-installation
b/modules/dsh/files/group/mediawiki-installation
similarity index 100%
rename from files/dsh/group/mediawiki-installation
rename to modules/dsh/files/group/mediawiki-installation
diff --git a/files/dsh/group/misc_eqiad b/modules/dsh/files/group/misc_eqiad
similarity index 100%
rename from files/dsh/group/misc_eqiad
rename to modules/dsh/files/group/misc_eqiad
diff --git a/files/dsh/group/misc_esams b/modules/dsh/files/group/misc_esams
similarity index 100%
rename from files/dsh/group/misc_esams
rename to modules/dsh/files/group/misc_esams
diff --git a/files/dsh/group/misc_frack b/modules/dsh/files/group/misc_frack
similarity index 100%
rename from files/dsh/group/misc_frack
rename to modules/dsh/files/group/misc_frack
diff --git a/files/dsh/group/misc_pmtpa b/modules/dsh/files/group/misc_pmtpa
similarity index 100%
rename from files/dsh/group/misc_pmtpa
rename to modules/dsh/files/group/misc_pmtpa
diff --git a/files/dsh/group/misc_ulsfo b/modules/dsh/files/group/misc_ulsfo
similarity index 100%
rename from files/dsh/group/misc_ulsfo
rename to modules/dsh/files/group/misc_ulsfo
diff --git a/files/dsh/group/mobile b/modules/dsh/files/group/mobile
similarity index 100%
rename from files/dsh/group/mobile
rename to modules/dsh/files/group/mobile
diff --git a/files/dsh/group/mw b/modules/dsh/files/group/mw
similarity index 100%
rename from files/dsh/group/mw
rename to modules/dsh/files/group/mw
diff --git a/files/dsh/group/mw-eqiad b/modules/dsh/files/group/mw-eqiad
similarity index 100%
rename from files/dsh/group/mw-eqiad
rename to modules/dsh/files/group/mw-eqiad
diff --git a/files/dsh/group/mw-pmtpa b/modules/dsh/files/group/mw-pmtpa
similarity index 100%
rename from files/dsh/group/mw-pmtpa
rename to modules/dsh/files/group/mw-pmtpa
diff --git a/files/dsh/group/mysq b/modules/dsh/files/group/mysq
similarity index 100%
rename from files/dsh/group/mysq
rename to modules/dsh/files/group/mysq
diff --git a/files/dsh/group/mysql b/modules/dsh/files/group/mysql
similarity index 100%
rename from files/dsh/group/mysql
rename to modules/dsh/files/group/mysql
diff --git a/files/dsh/group/mysql-secondary
b/modules/dsh/files/group/mysql-secondary
similarity index 100%
rename from files/dsh/group/mysql-secondary
rename to modules/dsh/files/group/mysql-secondary
diff --git a/files/dsh/group/parsoid b/modules/dsh/files/group/parsoid
similarity index 100%
rename from files/dsh/group/parsoid
rename to modules/dsh/files/group/parsoid
diff --git a/files/dsh/group/pmtpa b/modules/dsh/files/group/pmtpa
similarity index 100%
rename from files/dsh/group/pmtpa
rename to modules/dsh/files/group/pmtpa
diff --git a/files/dsh/group/pmtpa.text b/modules/dsh/files/group/pmtpa.text
similarity index 100%
rename from files/dsh/group/pmtpa.text
rename to modules/dsh/files/group/pmtpa.text
diff --git a/files/dsh/group/pmtpa.upload b/modules/dsh/files/group/pmtpa.upload
similarity index 100%
rename from files/dsh/group/pmtpa.upload
rename to modules/dsh/files/group/pmtpa.upload
diff --git a/files/dsh/group/scap-proxies b/modules/dsh/files/group/scap-proxies
similarity index 100%
rename from files/dsh/group/scap-proxies
rename to modules/dsh/files/group/scap-proxies
diff --git a/files/dsh/group/search b/modules/dsh/files/group/search
similarity index 100%
rename from files/dsh/group/search
rename to modules/dsh/files/group/search
diff --git a/files/dsh/group/search.eqiad b/modules/dsh/files/group/search.eqiad
similarity index 100%
rename from files/dsh/group/search.eqiad
rename to modules/dsh/files/group/search.eqiad
diff --git a/files/dsh/group/search_pmtpa b/modules/dsh/files/group/search_pmtpa
similarity index 100%
rename from files/dsh/group/search_pmtpa
rename to modules/dsh/files/group/search_pmtpa
diff --git a/files/dsh/group/searchidx b/modules/dsh/files/group/searchidx
similarity index 100%
rename from files/dsh/group/searchidx
rename to modules/dsh/files/group/searchidx
diff --git a/files/dsh/group/snapshot b/modules/dsh/files/group/snapshot
similarity index 100%
rename from files/dsh/group/snapshot
rename to modules/dsh/files/group/snapshot
diff --git a/files/dsh/group/sq b/modules/dsh/files/group/sq
similarity index 100%
rename from files/dsh/group/sq
rename to modules/dsh/files/group/sq
diff --git a/files/dsh/group/sq.old b/modules/dsh/files/group/sq.old
similarity index 100%
rename from files/dsh/group/sq.old
rename to modules/dsh/files/group/sq.old
diff --git a/files/dsh/group/squids_eqiad_text
b/modules/dsh/files/group/squids_eqiad_text
similarity index 100%
rename from files/dsh/group/squids_eqiad_text
rename to modules/dsh/files/group/squids_eqiad_text
diff --git a/files/dsh/group/squids_esams_text
b/modules/dsh/files/group/squids_esams_text
similarity index 100%
rename from files/dsh/group/squids_esams_text
rename to modules/dsh/files/group/squids_esams_text
diff --git a/files/dsh/group/squids_knams b/modules/dsh/files/group/squids_knams
similarity index 100%
rename from files/dsh/group/squids_knams
rename to modules/dsh/files/group/squids_knams
diff --git a/files/dsh/group/srv b/modules/dsh/files/group/srv
similarity index 100%
rename from files/dsh/group/srv
rename to modules/dsh/files/group/srv
diff --git a/files/dsh/group/ssl b/modules/dsh/files/group/ssl
similarity index 100%
rename from files/dsh/group/ssl
rename to modules/dsh/files/group/ssl
diff --git a/files/dsh/group/testwikipedia
b/modules/dsh/files/group/testwikipedia
similarity index 100%
rename from files/dsh/group/testwikipedia
rename to modules/dsh/files/group/testwikipedia
diff --git a/files/dsh/group/varnish-upload-eqiad
b/modules/dsh/files/group/varnish-upload-eqiad
similarity index 100%
rename from files/dsh/group/varnish-upload-eqiad
rename to modules/dsh/files/group/varnish-upload-eqiad
diff --git a/files/dsh/group/varnishncsa-all
b/modules/dsh/files/group/varnishncsa-all
similarity index 100%
rename from files/dsh/group/varnishncsa-all
rename to modules/dsh/files/group/varnishncsa-all
diff --git a/modules/dsh/manifests/files.pp b/modules/dsh/manifests/files.pp
new file mode 100644
index 0000000..3c31a16
--- /dev/null
+++ b/modules/dsh/manifests/files.pp
@@ -0,0 +1,23 @@
+# creates config files for dsh
+class dsh::files {
+
+ file {
+ '/etc/dsh':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0444';
+ '/etc/dsh/group':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/dsh/group',
+ recurse => true;
+ '/etc/dsh/dsh.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/dsh/dsh.conf';
+ }
+
+}
diff --git a/modules/dsh/manifests/groups.pp b/modules/dsh/manifests/groups.pp
new file mode 100644
index 0000000..8782a6a
--- /dev/null
+++ b/modules/dsh/manifests/groups.pp
@@ -0,0 +1,9 @@
+# Checks that this host belongs to dsh group(s)
+define dsh::groups( $groups = [] ) {
+ $groups_string = join( $groups, ' ' )
+
+ monitor_service { 'dsh':
+ description => 'dsh groups',
+ check_command => "check_dsh_groups!$groups_string",
+ }
+}
diff --git a/modules/dsh/manifests/init.pp b/modules/dsh/manifests/init.pp
new file mode 100644
index 0000000..db58600
--- /dev/null
+++ b/modules/dsh/manifests/init.pp
@@ -0,0 +1,12 @@
+# Standard installation of dsh (Dancer's distributed shell)
+
+class dsh {
+
+ package { 'dsh':
+ ensure => present
+ }
+
+ include dsh::files
+
+}
+
--
To view, visit https://gerrit.wikimedia.org/r/96413
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1e76911c79a8e465c33888fd91d1d921065bb8cd
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
