Andrew Bogott has submitted this change and it was merged.
Change subject: Add direct hostname lookup to labs hiera
......................................................................
Add direct hostname lookup to labs hiera
Change-Id: Ibabae85a22a6bf240ac72d9321446a60fe6512cd
---
R hieradata/labs/hosts/promethium.yaml
M modules/puppetmaster/files/labs.hiera.yaml
2 files changed, 1 insertion(+), 0 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
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..1658cb1 100644
--- a/modules/puppetmaster/files/labs.hiera.yaml
+++ b/modules/puppetmaster/files/labs.hiera.yaml
@@ -11,6 +11,7 @@
:secret:
:datadir: /etc/puppet/secret/hieradata
:hierarchy:
+ - "labs/hosts/%{::hostname}"
- "labs/%{::labsproject}/host/%{::hostname}"
- "labs/%{::labsproject}/common"
- "labs"
--
To view, visit https://gerrit.wikimedia.org/r/258071
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ibabae85a22a6bf240ac72d9321446a60fe6512cd
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
