Andrew Bogott has submitted this change and it was merged.
Change subject: Detect labsproject for labtest instances
......................................................................
Detect labsproject for labtest instances
Change-Id: Iac31100ae7736200f5a24310a743be4de3535a24
---
M modules/base/lib/facter/labsprojectfrommetadata.rb
1 file changed, 1 insertion(+), 1 deletion(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Alex Monk: Looks good to me, but someone else must approve
jenkins-bot: Verified
diff --git a/modules/base/lib/facter/labsprojectfrommetadata.rb
b/modules/base/lib/facter/labsprojectfrommetadata.rb
index c985cf0..e867abf 100644
--- a/modules/base/lib/facter/labsprojectfrommetadata.rb
+++ b/modules/base/lib/facter/labsprojectfrommetadata.rb
@@ -7,7 +7,7 @@
Facter.add(:labsprojectfrommetadata) do
setcode do
domain = Facter::Util::Resolution.exec("hostname -d").chomp
- if domain.end_with? ".wmflabs"
+ if (domain.end_with? ".wmflabs") || (domain.end_with? ".labtest")
# query the nova metadata service at 169.254.169.254
metadata = Facter::Util::Resolution.exec("curl -f
http://169.254.169.254/openstack/2013-10-17/meta_data.json/ 2> /dev/null").chomp
metadata[/project-id\":\ \"(.*?)\"/, 1]
--
To view, visit https://gerrit.wikimedia.org/r/288743
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Iac31100ae7736200f5a24310a743be4de3535a24
Gerrit-PatchSet: 3
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Alex Monk <kren...@gmail.com>
Gerrit-Reviewer: Andrew Bogott <abog...@wikimedia.org>
Gerrit-Reviewer: Gehel <gleder...@wikimedia.org>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
