Alexandros Kosiaris has submitted this change and it was merged.
Change subject: hiera role_backend: Don't qualify the _roles variable
......................................................................
hiera role_backend: Don't qualify the _roles variable
After 3.5, puppetmaster spew warnings like
(Scope(Class[main])) Could not look up qualified variable '::_roles';
Remove the force qualify from the _roles variable to allow hiera to look
it up in the current scope(which is by default anyway the top scope)
Change-Id: I057eb01e9a49dde6772b6aa256c8e658057abda3
---
M modules/wmflib/lib/hiera/backend/role_backend.rb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Alexandros Kosiaris: Verified; Looks good to me, approved
diff --git a/modules/wmflib/lib/hiera/backend/role_backend.rb
b/modules/wmflib/lib/hiera/backend/role_backend.rb
index 8bdf242..8de978c 100644
--- a/modules/wmflib/lib/hiera/backend/role_backend.rb
+++ b/modules/wmflib/lib/hiera/backend/role_backend.rb
@@ -115,7 +115,7 @@
end
def lookup(key, scope, order_override, resolution_type)
- topscope_var = '::_roles'
+ topscope_var = '_roles'
resultset = nil
return nil unless scope.include?topscope_var
roles = scope[topscope_var]
--
To view, visit https://gerrit.wikimedia.org/r/302674
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I057eb01e9a49dde6772b6aa256c8e658057abda3
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: Alexandros Kosiaris <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
