Andrew Bogott has submitted this change and it was merged.
Change subject: Remove duplicate definition of labs-project for metal instance
......................................................................
Remove duplicate definition of labs-project for metal instance
Everything we need is in the labs_metal hiera hash.
Change-Id: I61392b984e25ba99bf7f023aa431f3a4cf60bee6
---
D hieradata/labs/hosts/promethium.yaml
M manifests/realm.pp
2 files changed, 7 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
jenkins-bot: Verified
diff --git a/hieradata/labs/hosts/promethium.yaml
b/hieradata/labs/hosts/promethium.yaml
deleted file mode 100644
index 61140fc..0000000
--- a/hieradata/labs/hosts/promethium.yaml
+++ /dev/null
@@ -1 +0,0 @@
-labsproject: testlabs
diff --git a/manifests/realm.pp b/manifests/realm.pp
index 7848a78..4ab22ab 100644
--- a/manifests/realm.pp
+++ b/manifests/realm.pp
@@ -12,7 +12,13 @@
}
if $::realm == 'labs' {
- $labsproject = hiera('labsproject', $::labsprojectfrommetadata)
+
+ $labs_metal = hiera('labs_metal', {})
+ if has_key($labs_metal, $::hostname) {
+ $labsproject = $labs_metal[$::hostname]['project-name']
+ } else {
+ $labsproject = $::labsprojectfrommetadata
+ }
if $::labsproject == undef {
fail('Failed to determined $::labsproject')
--
To view, visit https://gerrit.wikimedia.org/r/260579
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I61392b984e25ba99bf7f023aa431f3a4cf60bee6
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <[email protected]>
Gerrit-Reviewer: Andrew Bogott <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
