Giuseppe Lavagetto has uploaded a new change for review. https://gerrit.wikimedia.org/r/211666
Change subject: Revert "hiera: use the proxy backend, rationalize the hierarchy" ...................................................................... Revert "hiera: use the proxy backend, rationalize the hierarchy" This reverts commit 8e5a76d842e3d709115e3e35fccf3e8d7248a258. Change-Id: Iac41f7b074b2f83e3f1c907ccc0ca8aaa22cb828 --- M modules/puppetmaster/files/production.hiera.yaml 1 file changed, 8 insertions(+), 10 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/66/211666/1 diff --git a/modules/puppetmaster/files/production.hiera.yaml b/modules/puppetmaster/files/production.hiera.yaml index 3e38065..33701db 100644 --- a/modules/puppetmaster/files/production.hiera.yaml +++ b/modules/puppetmaster/files/production.hiera.yaml @@ -1,10 +1,6 @@ :backends: - - proxy -:proxy: - :plugins: - - nuyaml - - role - :default_plugin: nuyaml + - nuyaml + - role :role: :datadir: /etc/puppet/hieradata :nuyaml: @@ -17,11 +13,13 @@ :hierarchy: - "hosts/%{::hostname}" - "regex/%{::fqdn}" - - "role://%{::site}" - "%{::site}" - - "role://private/%{::site}" - "private/%{::site}" - - "role://common" - "common" - - "role://private/common" + - "private/common" + +:role_hierarchy: + - "%{::site}" + - "common" + - "private/%{::site}" - "private/common" -- To view, visit https://gerrit.wikimedia.org/r/211666 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iac41f7b074b2f83e3f1c907ccc0ca8aaa22cb828 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Giuseppe Lavagetto <glavage...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits