Andrew Bogott has uploaded a new change for review.
https://gerrit.wikimedia.org/r/258071
Change subject: Add direct hostname lookup to labs hiera
......................................................................
Add direct hostname lookup to labs hiera
Rename the 'host' dir since it was empty and that
same dir is called 'hosts' elsewhere.
Change-Id: Ibabae85a22a6bf240ac72d9321446a60fe6512cd
---
R hieradata/labs/hosts/.gitignore
R hieradata/labs/hosts/promethium.yaml
M modules/puppetmaster/files/labs.hiera.yaml
3 files changed, 1 insertion(+), 0 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/71/258071/1
diff --git a/hieradata/labs/host/.gitignore b/hieradata/labs/hosts/.gitignore
similarity index 100%
rename from hieradata/labs/host/.gitignore
rename to hieradata/labs/hosts/.gitignore
diff --git a/hieradata/hosts/promethium.yaml
b/hieradata/labs/hosts/promethium.yaml
similarity index 100%
rename from hieradata/hosts/promethium.yaml
rename to hieradata/labs/hosts/promethium.yaml
diff --git a/modules/puppetmaster/files/labs.hiera.yaml
b/modules/puppetmaster/files/labs.hiera.yaml
index 85c5d13..40236d4 100644
--- a/modules/puppetmaster/files/labs.hiera.yaml
+++ b/modules/puppetmaster/files/labs.hiera.yaml
@@ -12,6 +12,7 @@
:datadir: /etc/puppet/secret/hieradata
:hierarchy:
- "labs/%{::labsproject}/host/%{::hostname}"
+ - "labs/hosts/%{::hostname}"
- "labs/%{::labsproject}/common"
- "labs"
- "secret/%{::labsproject}"
--
To view, visit https://gerrit.wikimedia.org/r/258071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ibabae85a22a6bf240ac72d9321446a60fe6512cd
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
