[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsprojectfrommetadata: use jq instead of trying to parse J...
Andrew Bogott has submitted this change and it was merged.
Change subject: labsprojectfrommetadata: use jq instead of trying to parse JSON
with regex
..
labsprojectfrommetadata: use jq instead of trying to parse JSON with regex
Change-Id: I0dbaf6d9304dfce1542bc17a96dccd20df3fe33a
---
M modules/base/lib/facter/labsprojectfrommetadata.rb
1 file changed, 2 insertions(+), 2 deletions(-)
Approvals:
Andrew Bogott: Looks good to me, approved
Yuvipanda: 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 0725e10..8d738d3 100644
--- a/modules/base/lib/facter/labsprojectfrommetadata.rb
+++ b/modules/base/lib/facter/labsprojectfrommetadata.rb
@@ -9,8 +9,8 @@
domain = Facter::Util::Resolution.exec("hostname -d").chomp
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/2015-10-15/meta_data.json/ 2> /dev/null").chomp
- metadata[/project_id\":\ \"(.*)\",/, 1]
+ metadata = Facter::Util::Resolution.exec("curl -f
http://169.254.169.254/openstack/2015-10-15/meta_data.json/ 2> /dev/null | jq
'.project_id'").chomp
+ metadata.slice(1, metadata.length - 2) # strip quotes
else
nil
end
--
To view, visit https://gerrit.wikimedia.org/r/307660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I0dbaf6d9304dfce1542bc17a96dccd20df3fe33a
Gerrit-PatchSet: 2
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk
Gerrit-Reviewer: Andrew Bogott
Gerrit-Reviewer: Gehel
Gerrit-Reviewer: Yuvipanda
Gerrit-Reviewer: jenkins-bot <>
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
[MediaWiki-commits] [Gerrit] operations/puppet[production]: labsprojectfrommetadata: use jq instead of trying to parse J...
Alex Monk has uploaded a new change for review.
https://gerrit.wikimedia.org/r/307660
Change subject: labsprojectfrommetadata: use jq instead of trying to parse JSON
with regex
..
labsprojectfrommetadata: use jq instead of trying to parse JSON with regex
Change-Id: I0dbaf6d9304dfce1542bc17a96dccd20df3fe33a
---
M modules/base/lib/facter/labsprojectfrommetadata.rb
1 file changed, 2 insertions(+), 2 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/60/307660/1
diff --git a/modules/base/lib/facter/labsprojectfrommetadata.rb
b/modules/base/lib/facter/labsprojectfrommetadata.rb
index 0725e10..8d738d3 100644
--- a/modules/base/lib/facter/labsprojectfrommetadata.rb
+++ b/modules/base/lib/facter/labsprojectfrommetadata.rb
@@ -9,8 +9,8 @@
domain = Facter::Util::Resolution.exec("hostname -d").chomp
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/2015-10-15/meta_data.json/ 2> /dev/null").chomp
- metadata[/project_id\":\ \"(.*)\",/, 1]
+ metadata = Facter::Util::Resolution.exec("curl -f
http://169.254.169.254/openstack/2015-10-15/meta_data.json/ 2> /dev/null | jq
'.project_id'").chomp
+ metadata.slice(1, metadata.length - 2) # strip quotes
else
nil
end
--
To view, visit https://gerrit.wikimedia.org/r/307660
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I0dbaf6d9304dfce1542bc17a96dccd20df3fe33a
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Alex Monk
___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
