Andrew Bogott has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/368097 )
Change subject: labtestpuppetmaster: add lots of hiera defs
......................................................................
labtestpuppetmaster: add lots of hiera defs
Change-Id: I50d583acfc2f5c8b0c36c35d9c31818d89481ff7
---
M hieradata/role/common/labs/puppetmaster/backend.yaml
M hieradata/role/common/labs/puppetmaster/frontend.yaml
2 files changed, 40 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/role/common/labs/puppetmaster/backend.yaml
b/hieradata/role/common/labs/puppetmaster/backend.yaml
index cbb7833..22b6980 100644
--- a/hieradata/role/common/labs/puppetmaster/backend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/backend.yaml
@@ -6,3 +6,24 @@
autosign: true
profile::puppetmaster::backend::secure_private: false
+
+profile::conftool::master::sync_dir: "/etc/conftool/data"
+
+profile::puppetmaster::frontend::web_hostname: labs-puppetmaster.wikimedia.org
+profile::puppetmaster::common::storeconfigs: none
+
+profile::puppetmaster::labsencapi::mysql_host: m5-master
+profile::puppetmaster::labsencapi::mysql_db: labspuppet
+profile::puppetmaster::labsencapi::mysql_username: labspuppet
+profile::puppetmaster::labsencapi::statsd_host: labmon1001.eqiad.wmnet
+profile::puppetmaster::labsencapi::statsd_prefix: labs.puppetbackend
+
+puppetmaster::servers:
+ labpuppetmaster1001.wikimedia.org:
+ - { worker: labpuppetmaster1001.wikimedia.org, loadfactor: 10 }
+ - { worker: labpuppetmaster1002.wikimedia.org, loadfactor: 20 }
+puppetmaster::ca_server: labs-puppetmaster.wikimedia.org
+
+labs_puppet_master: labs-puppetmaster.wikimedia.org
+
+puppetmaster::hiera_config: labs
diff --git a/hieradata/role/common/labs/puppetmaster/frontend.yaml
b/hieradata/role/common/labs/puppetmaster/frontend.yaml
index dc9e9fd..22b6980 100644
--- a/hieradata/role/common/labs/puppetmaster/frontend.yaml
+++ b/hieradata/role/common/labs/puppetmaster/frontend.yaml
@@ -8,5 +8,22 @@
profile::puppetmaster::backend::secure_private: false
profile::conftool::master::sync_dir: "/etc/conftool/data"
-profile::discovery::path: "/srv/config-master/discovery"
-profile::discovery::watch_interval: 60
+
+profile::puppetmaster::frontend::web_hostname: labs-puppetmaster.wikimedia.org
+profile::puppetmaster::common::storeconfigs: none
+
+profile::puppetmaster::labsencapi::mysql_host: m5-master
+profile::puppetmaster::labsencapi::mysql_db: labspuppet
+profile::puppetmaster::labsencapi::mysql_username: labspuppet
+profile::puppetmaster::labsencapi::statsd_host: labmon1001.eqiad.wmnet
+profile::puppetmaster::labsencapi::statsd_prefix: labs.puppetbackend
+
+puppetmaster::servers:
+ labpuppetmaster1001.wikimedia.org:
+ - { worker: labpuppetmaster1001.wikimedia.org, loadfactor: 10 }
+ - { worker: labpuppetmaster1002.wikimedia.org, loadfactor: 20 }
+puppetmaster::ca_server: labs-puppetmaster.wikimedia.org
+
+labs_puppet_master: labs-puppetmaster.wikimedia.org
+
+puppetmaster::hiera_config: labs
--
To view, visit https://gerrit.wikimedia.org/r/368097
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I50d583acfc2f5c8b0c36c35d9c31818d89481ff7
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
