Andrew Bogott has submitted this change and it was merged. Change subject: labs: move hiera settings around for the hiera god ......................................................................
labs: move hiera settings around for the hiera god Change-Id: Id8348b7e71893c1ee6c373402473b1162f959eaf --- M hieradata/eqiad.yaml M hieradata/role/eqiad/labs/puppetmaster.yaml 2 files changed, 6 insertions(+), 6 deletions(-) Approvals: Andrew Bogott: Looks good to me, approved jenkins-bot: Verified diff --git a/hieradata/eqiad.yaml b/hieradata/eqiad.yaml index 8d53547..8c53f2e 100644 --- a/hieradata/eqiad.yaml +++ b/hieradata/eqiad.yaml @@ -98,12 +98,6 @@ labs_horizon_host: "californium.wikimedia.org" labs_host_ips: '10.64.20.0/24' -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" - # These are the up-and-coming, better dns servers: labsdnsconfig: host: 'labs-ns0.wikimedia.org' diff --git a/hieradata/role/eqiad/labs/puppetmaster.yaml b/hieradata/role/eqiad/labs/puppetmaster.yaml index 77b3ddd..60a23d7 100644 --- a/hieradata/role/eqiad/labs/puppetmaster.yaml +++ b/hieradata/role/eqiad/labs/puppetmaster.yaml @@ -1 +1,7 @@ puppetmaster::hiera_config: labs + +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" -- To view, visit https://gerrit.wikimedia.org/r/309489 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: Id8348b7e71893c1ee6c373402473b1162f959eaf Gerrit-PatchSet: 2 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Yuvipanda <yuvipa...@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
