Chad has uploaded a new change for review.
https://gerrit.wikimedia.org/r/247304
Change subject: Move dsh code into scap where it belongs
......................................................................
Move dsh code into scap where it belongs
Nothing uses dsh except scap and our dsh setup is scap-specific
anyway. Removes the top-level dsh module.
dsh::config is now scap::dsh (for icinga). Removed the other
class since all it did was install dsh in one place...just do
it in scap::master itself
Change-Id: Ib66c162504e5eb7949e63e5fe2e4f67646905d18
---
R hieradata/common/scap/dsh.yaml
M hieradata/labs/deployment-prep/common.yaml
M manifests/role/icinga.pp
M manifests/role/mediawiki.pp
D modules/dsh/manifests/init.pp
R modules/scap/files/dsh/dsh.conf
R modules/scap/files/dsh/group/mediawiki-installation
R modules/scap/files/dsh/group/parsoid
R modules/scap/files/dsh/group/scap-test
R modules/scap/manifests/dsh.pp
M modules/scap/manifests/master.pp
11 files changed, 12 insertions(+), 20 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/04/247304/1
diff --git a/hieradata/common/dsh/config.yaml b/hieradata/common/scap/dsh.yaml
similarity index 100%
rename from hieradata/common/dsh/config.yaml
rename to hieradata/common/scap/dsh.yaml
diff --git a/hieradata/labs/deployment-prep/common.yaml
b/hieradata/labs/deployment-prep/common.yaml
index 9d63af7..5595ae4 100644
--- a/hieradata/labs/deployment-prep/common.yaml
+++ b/hieradata/labs/deployment-prep/common.yaml
@@ -117,7 +117,7 @@
"role::url_downloader::url_downloader_ip": 10.68.16.135
"zotero::http_proxy":
deployment-urldownloader.deployment-prep.eqiad.wmflabs:8080
"role::trebuchet::deployment_server": deployment-bastion.eqiad.wmflabs
-"dsh::config::group_source": 'puppet:///modules/beta/dsh/group'
+"scap::dsh::group_source": 'puppet:///modules/beta/dsh/group'
"mediawiki::users::mwdeploy_pub_key": 'ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAABAQDFwlmBBBJAr1GI+vuYjFh5vq0YIVa5fqE5DZdpzUZISlQ0Kt+9bIr2qNHIj+Jl5Bc6ZY1mkh8l693tAHVx+8tayoiFWYNs9IVsxR+iHgOOhAdDIBXaHaUattdiye5bQmdvJVXaVegckNX2gbmUCOc09jvZvlk3blKFTSEpZRU8dmpXQzKdZgaAq2VTajAegoFnuN9FbC7hzBPA+1NxFNKn94eIeFPSlo5rWr44OEb5Uy3O0B5c6WPM+IgfiygetP+yGL4cKv7qEjZ0Sxok/Rh1lBh1vP1YQ/Mc6tMV0s+kOv7Wz+P88bfU1/uWvy479OZdfh3NQqDTrLzqHwVW1vef
root@deployment-salt'
# NOTE: these elasticsearch settings will need to be overloaded on a per-host
# basis for the Logstash Elasticsearch cluster.
diff --git a/manifests/role/icinga.pp b/manifests/role/icinga.pp
index b7de3f5..727f0c0 100644
--- a/manifests/role/icinga.pp
+++ b/manifests/role/icinga.pp
@@ -22,7 +22,7 @@
include lvs::monitor
include role::authdns::monitoring
include network::checks
- include dsh::config
+ include scap::dsh
include mysql
include icinga::gsbmonitoring
include nrpe
diff --git a/manifests/role/mediawiki.pp b/manifests/role/mediawiki.pp
index 8a0b065..1d58e5f 100644
--- a/manifests/role/mediawiki.pp
+++ b/manifests/role/mediawiki.pp
@@ -45,7 +45,7 @@
normal_check_interval => 60,
}
}
- $scap_proxies = hiera('dsh::config::scap_proxies',[])
+ $scap_proxies = hiera('scap::dsh::scap_proxies',[])
if member($scap_proxies, $::fqdn) {
include scap::proxy
diff --git a/modules/dsh/manifests/init.pp b/modules/dsh/manifests/init.pp
deleted file mode 100644
index e2eecbc..0000000
--- a/modules/dsh/manifests/init.pp
+++ /dev/null
@@ -1,12 +0,0 @@
-# == 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
-}
diff --git a/modules/dsh/files/dsh.conf b/modules/scap/files/dsh/dsh.conf
similarity index 100%
rename from modules/dsh/files/dsh.conf
rename to modules/scap/files/dsh/dsh.conf
diff --git a/modules/dsh/files/group/mediawiki-installation
b/modules/scap/files/dsh/group/mediawiki-installation
similarity index 100%
rename from modules/dsh/files/group/mediawiki-installation
rename to modules/scap/files/dsh/group/mediawiki-installation
diff --git a/modules/dsh/files/group/parsoid
b/modules/scap/files/dsh/group/parsoid
similarity index 100%
rename from modules/dsh/files/group/parsoid
rename to modules/scap/files/dsh/group/parsoid
diff --git a/modules/dsh/files/group/scap-test
b/modules/scap/files/dsh/group/scap-test
similarity index 100%
rename from modules/dsh/files/group/scap-test
rename to modules/scap/files/dsh/group/scap-test
diff --git a/modules/dsh/manifests/config.pp b/modules/scap/manifests/dsh.pp
similarity index 82%
rename from modules/dsh/manifests/config.pp
rename to modules/scap/manifests/dsh.pp
index 7d3f230..2b47a6f 100644
--- a/modules/dsh/manifests/config.pp
+++ b/modules/scap/manifests/dsh.pp
@@ -1,9 +1,9 @@
-# == Class dsh::config
+# == Class scap::dsh
#
# Sets up dsh config files alone, without actually
# setting up dsh. Useful primarily for monitoring
-class dsh::config (
- $group_source = 'puppet:///modules/dsh/group',
+class scap::dsh (
+ $group_source = 'puppet:///modules/scap/dsh/group',
$scap_proxies = [],
){
file { '/etc/dsh':
@@ -31,6 +31,6 @@
owner => 'root',
group => 'root',
mode => '0444',
- source => 'puppet:///modules/dsh/dsh.conf',
+ source => 'puppet:///modules/scap/dsh/dsh.conf',
}
}
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index b02285f..ea28754 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -10,11 +10,15 @@
$deployment_group = 'wikidev',
) {
include scap::scripts
+ include scap::dsh
include rsync::server
include network::constants
- include dsh
include mediawiki::scap
+ package { 'dsh':
+ ensure => present,
+ }
+
git::clone { 'operations/mediawiki-config':
directory => $common_source_path,
ensure => present,
--
To view, visit https://gerrit.wikimedia.org/r/247304
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ib66c162504e5eb7949e63e5fe2e4f67646905d18
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Chad <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
