Yuvipanda has submitted this change and it was merged.
Change subject: labs: Add config for the puppet enc
......................................................................
labs: Add config for the puppet enc
Contains info on the host on which the rest backend lives
Change-Id: I56fe1945e10e1771292b2a2305408a105eb92d6d
---
M hieradata/codfw/labtest-instances.yaml
M hieradata/labs.yaml
M modules/role/manifests/labs/puppetmaster.pp
3 files changed, 11 insertions(+), 0 deletions(-)
Approvals:
Yuvipanda: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/codfw/labtest-instances.yaml
b/hieradata/codfw/labtest-instances.yaml
index 8bc25c7..6f251fc 100644
--- a/hieradata/codfw/labtest-instances.yaml
+++ b/hieradata/codfw/labtest-instances.yaml
@@ -1,5 +1,6 @@
puppetmaster: "labtestcontrol2001.wikimedia.org"
saltmaster: "labtestcontrol2001.wikimedia.org"
+labs_puppet_master: "labtestcontrol2001.wikimedia.org"
ldap_host: "labtestservices2001.wikimedia.org"
labsdnsconfig:
diff --git a/hieradata/labs.yaml b/hieradata/labs.yaml
index a14f351..8af7c5f 100644
--- a/hieradata/labs.yaml
+++ b/hieradata/labs.yaml
@@ -118,6 +118,7 @@
nrpe::allowed_hosts: '10.68.16.195'
ssh::server::disable_agent_forwarding: false
+labs_puppet_master: "labs-puppetmaster-eqiad.wikimedia.org"
puppetmaster: "labs-puppetmaster-eqiad.wikimedia.org"
saltmaster: "labs-puppetmaster-eqiad.wikimedia.org"
mysql::server::use_apparmor: false # The images we have for debian don't
support it
diff --git a/modules/role/manifests/labs/puppetmaster.pp
b/modules/role/manifests/labs/puppetmaster.pp
index 90a3f49..d85e09e 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -26,6 +26,15 @@
include ldap::yamlcreds
+ file { '/etc/puppet-enc.yaml':
+ content => ordered_yaml({
+ host => hiera('labs_puppet_master'),
+ }),
+ mode => '0444',
+ owner => 'root',
+ group => 'root',
+ }
+
file { '/usr/local/bin/puppet-enc':
source => 'puppet:///modules/role/labs/puppet-enc.py',
mode => '0555',
--
To view, visit https://gerrit.wikimedia.org/r/311643
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I56fe1945e10e1771292b2a2305408a105eb92d6d
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: Yuvipanda <yuvipa...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
