Giuseppe Lavagetto has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/350842 )
Change subject: profile::scap::dsh: define, use everywhere instead of scap::dsh
......................................................................
profile::scap::dsh: define, use everywhere instead of scap::dsh
This allows us to have a centralized configuration for dsh groups for
scap. Strictly speaking, we shouldn't even need to have the scap::dsh
class at this point, and let maybe a profile::scap::mediawiki define the
scap::dsh::groups that are relevant to it. But that's for a later time.
Change-Id: Ia861f7cafc7cae0cbbdfc8d15d8b56cc12729b1d
---
A modules/profile/manifests/scap/dsh.pp
M modules/role/manifests/bastionhost/general.pp
M modules/role/manifests/deployment/mediawiki.pp
M modules/role/manifests/icinga.pp
M modules/scap/manifests/dsh.pp
M modules/scap/manifests/master.pp
6 files changed, 27 insertions(+), 11 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/42/350842/1
diff --git a/modules/profile/manifests/scap/dsh.pp
b/modules/profile/manifests/scap/dsh.pp
new file mode 100644
index 0000000..b0d6634
--- /dev/null
+++ b/modules/profile/manifests/scap/dsh.pp
@@ -0,0 +1,20 @@
+# == Class profile::scap::dsh
+#
+# Installs the dsh files used by scap on a host
+class profile::scap::dsh(
+ $groups = hiera('scap::dsh::groups'),
+ $proxies = hiera('scap::dsh::scap_proxies', []),
+ $masters = hiera('scap::dsh::scap_masters', []),
+ $conftool_prefix = hiera('conftool_prefix'),
+) {
+ class { 'confd':
+ interval => 300,
+ prefix => $conftool_prefix,
+ }
+
+ class { '::scap::dsh':
+ groups => $groups,
+ scap_proxies => $proxies,
+ scap_masters => $masters,
+ }
+}
diff --git a/modules/role/manifests/bastionhost/general.pp
b/modules/role/manifests/bastionhost/general.pp
index b4d8d0b..542e04d 100644
--- a/modules/role/manifests/bastionhost/general.pp
+++ b/modules/role/manifests/bastionhost/general.pp
@@ -10,7 +10,8 @@
include ::profile::backup::host
# Used by parsoid deployers
- include ::scap::dsh
+
+ include ::profile::scap::dsh
backup::set {'home': }
diff --git a/modules/role/manifests/deployment/mediawiki.pp
b/modules/role/manifests/deployment/mediawiki.pp
index e29f817..ae1a161 100644
--- a/modules/role/manifests/deployment/mediawiki.pp
+++ b/modules/role/manifests/deployment/mediawiki.pp
@@ -9,8 +9,9 @@
include ::mediawiki
include ::mediawiki::packages::php5
include ::profile::mediawiki::nutcracker
- include scap::master
- include scap::ferm
+ include ::scap::master
+ include ::profile::scap::dsh
+ include ::scap::ferm
# Keyholder
require ::keyholder
diff --git a/modules/role/manifests/icinga.pp b/modules/role/manifests/icinga.pp
index b1d0fbe..7b959ff 100644
--- a/modules/role/manifests/icinga.pp
+++ b/modules/role/manifests/icinga.pp
@@ -26,7 +26,7 @@
include role::authdns::monitoring
include netops::monitoring
- include scap::dsh
+ include ::profile::scap::dsh
include mysql
include ::standard
include ::base::firewall
diff --git a/modules/scap/manifests/dsh.pp b/modules/scap/manifests/dsh.pp
index 2a8ab17..d21d8e5 100644
--- a/modules/scap/manifests/dsh.pp
+++ b/modules/scap/manifests/dsh.pp
@@ -12,6 +12,7 @@
# List of FQDNs for servers to be used as scap masters. Default []
#
class scap::dsh (
+ $groups = {},
$scap_proxies = [],
$scap_masters = [],
){
@@ -30,7 +31,6 @@
}
# Base dsh groups currently used
- $groups = hiera('scap::dsh::groups', {})
create_resources('scap::dsh::group', $groups)
file { '/etc/dsh/group/scap-proxies':
diff --git a/modules/scap/manifests/master.pp b/modules/scap/manifests/master.pp
index 5b8c28d..f99a54b 100644
--- a/modules/scap/manifests/master.pp
+++ b/modules/scap/manifests/master.pp
@@ -9,14 +9,8 @@
$statsd_host = 'statsd.eqiad.wmnet',
$statsd_port = 8125,
$deployment_group = 'wikidev',
- $conftool_prefix = hiera('conftool_prefix'),
) {
include scap::scripts
- class { 'confd':
- interval => 300,
- prefix => $conftool_prefix,
- }
- include scap::dsh
include rsync::server
include network::constants
include mediawiki::scap
--
To view, visit https://gerrit.wikimedia.org/r/350842
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia861f7cafc7cae0cbbdfc8d15d8b56cc12729b1d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Giuseppe Lavagetto <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
