Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/309591
Change subject: Wrap labspuppetbackend in a role class
......................................................................
Wrap labspuppetbackend in a role class
Hiera was getting too convoluted, hopefully this will
follow established patterns a bit better.
Change-Id: Ie7128665ee9c647ef82fec352917cab500d505c4
---
A hieradata/eqiad/labs/puppetbackend.yaml
D hieradata/eqiad/labspuppetbackend.yaml
M hieradata/hosts/labtestcontrol2001.yaml
M manifests/site.pp
A modules/role/manifests/labs/puppetbackend.pp
M modules/role/manifests/labs/puppetmaster.pp
6 files changed, 28 insertions(+), 14 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/309591/1
diff --git a/hieradata/eqiad/labs/puppetbackend.yaml
b/hieradata/eqiad/labs/puppetbackend.yaml
new file mode 100644
index 0000000..398091e
--- /dev/null
+++ b/hieradata/eqiad/labs/puppetbackend.yaml
@@ -0,0 +1 @@
+mysql_host: "m5-master.eqiad.wmnet"
diff --git a/hieradata/eqiad/labspuppetbackend.yaml
b/hieradata/eqiad/labspuppetbackend.yaml
deleted file mode 100644
index 6c2120e..0000000
--- a/hieradata/eqiad/labspuppetbackend.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-labspuppetbackend::mysql_host: "m5-master.eqiad.wmnet"
-labspuppetbackend::mysql_db: "labspuppet"
-labspuppetbackend::mysql_username: "labspuppet"
-labspuppetbackend::statsd_host: "labmon1001.eqiad.wmnet"
-labspuppetbackend::statsd_prefix: "labs.puppetbackend"
diff --git a/hieradata/hosts/labtestcontrol2001.yaml
b/hieradata/hosts/labtestcontrol2001.yaml
index 09ededb..174c0b0 100644
--- a/hieradata/hosts/labtestcontrol2001.yaml
+++ b/hieradata/hosts/labtestcontrol2001.yaml
@@ -4,9 +4,7 @@
puppetmaster::hiera_config: labtest
-labspuppetbackend::mysql_host: labtestcontrol2001.wikimedia.org
-labspuppetbackend::mysql_db: labspuppet
-labspuppetbackend::mysql_username: labspuppet
-labspuppetbackend::statsd_host: labmon1001.eqiad.wmnet
-labspuppetbackend::statsd_prefix: labtest.puppetbackend
+role::labs::puppetbackend::mysql_host: labtestcontrol2001.wikimedia.org
+role::labs::puppetbackend::statsd_prefix: labtest.puppetbackend
+
role::labs::puppetmaster::use_enc: true
diff --git a/manifests/site.pp b/manifests/site.pp
index 79868b2..2c868adb 100644
--- a/manifests/site.pp
+++ b/manifests/site.pp
@@ -1192,7 +1192,9 @@
node 'labtestcontrol2001.wikimedia.org' {
include standard
include base::firewall
- role(labs::openstack::nova::controller, labs::puppetmaster)
+ role(labs::openstack::nova::controller,
+ labs::puppetmaster,
+ labs::puppetbackend)
# Labtest is weird; the mysql server is on labtestcontrol2001. So
# we need some special fw rules to allow that
@@ -1373,7 +1375,8 @@
role(labs::openstack::nova::controller,
labs::puppetmaster,
salt::masters::labs,
- deployment::salt_masters)
+ deployment::salt_masters,
+ labs::puppetbackend)
include base::firewall
include standard
diff --git a/modules/role/manifests/labs/puppetbackend.pp
b/modules/role/manifests/labs/puppetbackend.pp
new file mode 100644
index 0000000..ba0e55c
--- /dev/null
+++ b/modules/role/manifests/labs/puppetbackend.pp
@@ -0,0 +1,19 @@
+# vim: set tabstop=4 shiftwidth=4 softtabstop=4 expandtab textwidth=80 smarttab
+
+class role::labs::puppetbackend(
+ $mysql_host,
+ $mysql_db = 'labspuppet',
+ $mysql_username = 'labspuppet',
+ $mysql_password = 'labspuppet',
+ $statsd_host = 'labmon1001.eqiad.wmnet',
+ $statsd_prefix = 'labs.puppetbackend',
+) {
+ class { '::labspuppetbackend':
+ mysql_host => $mysql_host,
+ mysql_db => $mysql_db,
+ mysql_username => $mysql_username,
+ mysql_password => $mysql_password,
+ statsd_host => $statsd_host,
+ statsd_prefix => $statsd_prefix,
+ }
+}
diff --git a/modules/role/manifests/labs/puppetmaster.pp
b/modules/role/manifests/labs/puppetmaster.pp
index d7d9c99..23c634c 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -82,6 +82,4 @@
remote_cert_cleaner => hiera('labs_certmanager_hostname'),
}
}
-
- include labspuppetbackend
}
--
To view, visit https://gerrit.wikimedia.org/r/309591
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7128665ee9c647ef82fec352917cab500d505c4
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
