Andrew Bogott has submitted this change and it was merged.
Change subject: Allow access to the labs puppetmaster from labs metal hosts.
......................................................................
Allow access to the labs puppetmaster from labs metal hosts.
Bug: T95185
Change-Id: Icc57ebb65e6ff94bedd7ad44e64e0f9b2f4254f1
---
M modules/role/manifests/labs/puppetmaster.pp
1 file changed, 2 insertions(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/modules/role/manifests/labs/puppetmaster.pp
b/modules/role/manifests/labs/puppetmaster.pp
index b0247cc..78e5648 100644
--- a/modules/role/manifests/labs/puppetmaster.pp
+++ b/modules/role/manifests/labs/puppetmaster.pp
@@ -11,12 +11,13 @@
$network::constants::all_network_subnets['production']['eqiad']['private']['labs-instances1-c-eqiad']['ipv4'],
$network::constants::all_network_subnets['production']['eqiad']['private']['labs-instances1-d-eqiad']['ipv4'],
]
+ $labs_metal = hiera('labs_baremetal_servers', [])
$ldapconfig = $ldap::role::config::labs::ldapconfig
$basedn = $ldapconfig['basedn']
# Only allow puppet access from the instances
- $allow_from = flatten([$labs_ranges, '208.80.154.14'])
+ $allow_from = flatten([$labs_ranges, '208.80.154.14', $labs_metal])
class { '::puppetmaster':
server_name => hiera('labs_puppet_master'),
--
To view, visit https://gerrit.wikimedia.org/r/257805
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Icc57ebb65e6ff94bedd7ad44e64e0f9b2f4254f1
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
