Andrew Bogott has submitted this change and it was merged.
Change subject: role::puppet::server::labs Remove unused configuration
......................................................................
role::puppet::server::labs Remove unused configuration
These have not been used in a very long time. Also $realm is a global
level variable
Change-Id: Ie3d772a0e14b4be893fb0aa0ebd0316f2f2c4fca
---
M manifests/role/puppet.pp
1 file changed, 1 insertion(+), 9 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/manifests/role/puppet.pp b/manifests/role/puppet.pp
index d01d4d8..977c26b 100644
--- a/manifests/role/puppet.pp
+++ b/manifests/role/puppet.pp
@@ -3,15 +3,11 @@
include ldap::role::config::labs
$novaconfig = $role::nova::config::novaconfig
- $puppet_db_name = $novaconfig['puppet_db_name']
- $puppet_db_user = $novaconfig['puppet_db_user']
- $puppet_db_pass = $novaconfig['puppet_db_pass']
-
$ldapconfig = $ldap::role::config::labs::ldapconfig
$basedn = $ldapconfig['basedn']
# Only allow puppet access from the instances
- $puppet_passenger_allow_from = $realm ? {
+ $puppet_passenger_allow_from = $::realm ? {
'production' => [ '10.68.16.0/21', '208.80.154.14' ],
'labs' => [ '192.168.0.0/21' ],
}
@@ -21,10 +17,6 @@
allow_from => $puppet_passenger_allow_from,
config => {
'thin_storeconfigs' => false,
- # 'dbadapter' => "mysql",
- # 'dbuser' => $novaconfig["puppet_db_user"],
- # 'dbpassword' => $novaconfig["puppet_db_pass"],
- # 'dbserver' => $novaconfig["puppet_db_host"],
'node_terminus' => 'ldap',
'ldapserver' => $ldapconfig['servernames'][0],
'ldapbase' => "ou=hosts,${basedn}",
--
To view, visit https://gerrit.wikimedia.org/r/214637
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ie3d772a0e14b4be893fb0aa0ebd0316f2f2c4fca
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[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
