Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/283728
Change subject: Allow horizon to query the labs puppetmaster for a list of
classes
......................................................................
Allow horizon to query the labs puppetmaster for a list of classes
Change-Id: I0353597429468f9aaba4f419f0fb8974a53f9b02
---
M modules/puppetmaster/manifests/labs.pp
M modules/role/manifests/labs/puppetmaster.pp
2 files changed, 9 insertions(+), 1 deletion(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/28/283728/1
diff --git a/modules/puppetmaster/manifests/labs.pp
b/modules/puppetmaster/manifests/labs.pp
index 820b03d..2f972a5 100644
--- a/modules/puppetmaster/manifests/labs.pp
+++ b/modules/puppetmaster/manifests/labs.pp
@@ -21,4 +21,11 @@
user => 'gitpuppet',
minute => '*/1',
}
+
+ file { '/etc/puppet/auth.conf':
+ owner => 'root',
+ group => 'root',
+ mode => '0444',
+ source => 'puppet:///modules/puppetmaster/auth-labs-master.conf',
+ }
}
diff --git a/modules/role/manifests/labs/puppetmaster.pp
b/modules/role/manifests/labs/puppetmaster.pp
index c9ae05c..29ba441 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -14,10 +14,11 @@
$labs_metal = hiera('labs_baremetal_servers', [])
$ldapconfig = $ldap::role::config::labs::ldapconfig
$basedn = $ldapconfig['basedn']
+ $horizon_host_ip = ipresolve(hiera('labs_horizon_host'), 4)
# Only allow puppet access from the instances
- $allow_from = flatten([$labs_ranges, '208.80.154.14', $labs_metal])
+ $allow_from = flatten([$labs_ranges, '208.80.154.14', $horizon_host_ip,
$labs_metal])
class { '::puppetmaster':
server_name => hiera('labs_puppet_master'),
--
To view, visit https://gerrit.wikimedia.org/r/283728
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0353597429468f9aaba4f419f0fb8974a53f9b02
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
