Yuvipanda has uploaded a new change for review.
https://gerrit.wikimedia.org/r/162570
Change subject: dsh: Move dsh related code into a module
......................................................................
dsh: Move dsh related code into a module
Change-Id: Ic1bacaae8b3ef6fec2065ab8b63e72f3dcf6b2d5
---
M manifests/misc/deployment.pp
D manifests/misc/dsh.pp
M manifests/misc/icinga.pp
M manifests/role/apachesync.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/api
R modules/dsh/files/group/bits
R modules/dsh/files/group/bits_esams
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/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/mc_eqiad
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/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/scap-proxies
R modules/dsh/files/group/search
R modules/dsh/files/group/snapshot
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/dsh.pp
A modules/dsh/manifests/monitor.pp
54 files changed, 56 insertions(+), 51 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/70/162570/1
diff --git a/manifests/misc/deployment.pp b/manifests/misc/deployment.pp
index eb94f62..0fee3ec 100644
--- a/manifests/misc/deployment.pp
+++ b/manifests/misc/deployment.pp
@@ -4,8 +4,8 @@
class misc::deployment {
system::role { 'misc::deployment': description => 'Deployment host' }
- include misc::deployment::scap_primary,
- misc::dsh
+ include misc::deployment::scap_primary
+ include dsh
}
class misc::deployment::common_scripts {
diff --git a/manifests/misc/dsh.pp b/manifests/misc/dsh.pp
deleted file mode 100644
index b4f9bbb..0000000
--- a/manifests/misc/dsh.pp
+++ /dev/null
@@ -1,45 +0,0 @@
-# == Class misc::dsh
-#
-# 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',
- }
- file { '/etc/dsh/group':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/dsh/group',
- recurse => true,
- }
- file { '/etc/dsh/dsh.conf':
- owner => 'root',
- group => 'root',
- mode => '0444',
- source => 'puppet:///files/dsh/dsh.conf',
- }
- }
-}
-
-# == Define dsh_groups
-#
-# 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/misc/icinga.pp b/manifests/misc/icinga.pp
index b611778..518d0ef 100644
--- a/manifests/misc/icinga.pp
+++ b/manifests/misc/icinga.pp
@@ -42,7 +42,7 @@
include icinga::monitor::wikidata
include icinga::user
include lvs::monitor
- include misc::dsh::files
+ include dsh::config
include mysql
include nagios::gsbmonitoring
include nrpe
diff --git a/manifests/role/apachesync.pp b/manifests/role/apachesync.pp
index bcb8905..6c517d6 100644
--- a/manifests/role/apachesync.pp
+++ b/manifests/role/apachesync.pp
@@ -6,7 +6,7 @@
}
include ::apachesync
- include misc::dsh
+ include dsh
include rsync::server
include network::constants
diff --git a/manifests/site.pp b/manifests/site.pp
index 897673e..b53fb47 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -360,7 +360,7 @@
include bastionhost
include nfs::netapp::home::othersite
- include misc::dsh
+ include dsh
include ssh::hostkeys-collect
}
@@ -1304,7 +1304,7 @@
include misc::noc-wikimedia
include drac
include generic::wikidev-umask
- include misc::dsh
+ include dsh
include ssh::hostkeys-collect
include mysql_wmf::client
install_certificate{ 'noc.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/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/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/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/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/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/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/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/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/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/dsh.pp b/modules/dsh/manifests/dsh.pp
new file mode 100644
index 0000000..c521ad7
--- /dev/null
+++ b/modules/dsh/manifests/dsh.pp
@@ -0,0 +1,38 @@
+# == Class dsh
+#
+# Standard installation of dsh (Dancer's distributed shell)
+#
+# Also sets up all groups from modules/dsh/files/group
+class dsh {
+ package { 'dsh':
+ ensure => present,
+ }
+
+ include dsh::config
+}
+
+# == Class dsh::config
+#
+# Sets up dsh config files alone, without actually
+# setting up dsh. Useful primarily for monitoring
+class dsh::config {
+ file { '/etc/dsh':
+ ensure => directory,
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ }
+ file { '/etc/dsh/group':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/dsh/group',
+ recurse => true,
+ }
+ file { '/etc/dsh/dsh.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/dsh/dsh.conf',
+ }
+}
diff --git a/modules/dsh/manifests/monitor.pp b/modules/dsh/manifests/monitor.pp
new file mode 100644
index 0000000..d95f517
--- /dev/null
+++ b/modules/dsh/manifests/monitor.pp
@@ -0,0 +1,12 @@
+# == Define dsh::monitor::groups
+#
+# Checks that this host belongs to dsh group(s)
+#
+define dsh::monitor::groups( $groups = [] ) {
+ $groups_string = join( $groups, ' ' )
+
+ monitor_service { 'dsh':
+ description => 'dsh groups',
+ check_command => "check_dsh_groups!${groups_string}",
+ }
+}
--
To view, visit https://gerrit.wikimedia.org/r/162570
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic1bacaae8b3ef6fec2065ab8b63e72f3dcf6b2d5
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@gmail.com>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
