Tim Landscheidt has uploaded a new change for review. ( https://gerrit.wikimedia.org/r/329226 )
Change subject: puppetmaster: Enable expand_path for Hiera in Labs as well ...................................................................... puppetmaster: Enable expand_path for Hiera in Labs as well With the current settings when Hiera looks up a key, it searches the labs/private repository only for the files: - /etc/puppet/private/hieradata/labs/%{::labsproject}/common.yaml - /etc/puppet/private/hieradata/%{::labsproject}.yaml - /etc/puppet/private/hieradata/labs.yaml - /etc/puppet/private/hieradata/common.yaml However for example the key puppetdb::password::rw is defined in the file /etc/puppet/private/hieradata/common/puppetdb/password.yaml, thus it cannot be found. This change enables expand_path for Hiera in Labs as well, causing it to additionally search /etc/puppet/private/hieradata/common/puppetdb/password.yaml for the key puppetdb::password::rw. Change-Id: Iaf73d6f52ec402cb7c1b7eebd0bc462b55343825 --- M modules/puppetmaster/files/labs.hiera.yaml 1 file changed, 2 insertions(+), 0 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet refs/changes/26/329226/1 diff --git a/modules/puppetmaster/files/labs.hiera.yaml b/modules/puppetmaster/files/labs.hiera.yaml index 5a1fa0d..232ebbf 100644 --- a/modules/puppetmaster/files/labs.hiera.yaml +++ b/modules/puppetmaster/files/labs.hiera.yaml @@ -4,6 +4,8 @@ - nuyaml :nuyaml: :datadir: /etc/puppet/hieradata + :expand_path: + - common :mwyaml: :host: https://wikitech.wikimedia.org :cache_ttl: 120 -- To view, visit https://gerrit.wikimedia.org/r/329226 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iaf73d6f52ec402cb7c1b7eebd0bc462b55343825 Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet Gerrit-Branch: production Gerrit-Owner: Tim Landscheidt <t...@tim-landscheidt.de> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits