[MediaWiki-commits] [Gerrit] operations/puppet[production]: Labs firstboot.sh: Use the new project_id setting

[Andrew Bogott (Code Review)]

Andrew Bogott has submitted this change and it was merged.

Change subject: Labs firstboot.sh:  Use the new project_id setting
..


Labs firstboot.sh:  Use the new project_id setting

Bug: T105891
Change-Id: I0335b5921070bf98f3ff47c5623693eb73ba5064
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 2 insertions(+), 2 deletions(-)

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/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index adc5dee..f11a2e7 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -65,7 +65,7 @@
 fi
 # At this point, all (the rest of) our disk are belong to LVM.
 
-project=`curl http://169.254.169.254/openstack/latest/meta_data.json/ | sed -r 
's/^.*project-id\": \"//'  | sed -r 's/\".*$//g'`
+project=`curl http://169.254.169.254/openstack/latest/meta_data.json/ | sed -r 
's/^.*project_id\": \"//'  | sed -r 's/\".*$//g'`
 ip=`curl http://169.254.169.254/1.0/meta-data/local-ipv4 2> /dev/null`
 hostname=`hostname`
 # domain is the last two domain sections, e.g. eqiad.wmflabs
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index 0b62c76..a6fb4f9 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -41,7 +41,7 @@
 fi
 # At this point, all (the rest of) our disk are belong to LVM.
 
-project=`curl http://169.254.169.254/openstack/latest/meta_data.json/ | sed -r 
's/^.*project-id\": \"//'  | sed -r 's/\".*$//g'`
+project=`curl http://169.254.169.254/openstack/latest/meta_data.json/ | sed -r 
's/^.*project_id\": \"//'  | sed -r 's/\".*$//g'`
 ip=`curl http://169.254.169.254/1.0/meta-data/local-ipv4 2> /dev/null`
 hostname=`hostname`
 # domain is the last two domain sections, e.g. eqiad.wmflabs

-- 
To view, visit https://gerrit.wikimedia.org/r/307671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: merged
Gerrit-Change-Id: I0335b5921070bf98f3ff47c5623693eb73ba5064
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 
Gerrit-Reviewer: Alex Monk 
Gerrit-Reviewer: Andrew Bogott 
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]: Labs firstboot.sh: Use the new project_id setting

[Andrew Bogott (Code Review)]

Andrew Bogott has uploaded a new change for review.

  https://gerrit.wikimedia.org/r/307671

Change subject: Labs firstboot.sh:  Use the new project_id setting
..

Labs firstboot.sh:  Use the new project_id setting

Bug: T105891
Change-Id: I0335b5921070bf98f3ff47c5623693eb73ba5064
---
M modules/labs_bootstrapvz/files/firstboot.sh
M modules/labs_vmbuilder/files/firstboot.sh
2 files changed, 2 insertions(+), 2 deletions(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/71/307671/1

diff --git a/modules/labs_bootstrapvz/files/firstboot.sh 
b/modules/labs_bootstrapvz/files/firstboot.sh
index adc5dee..f11a2e7 100644
--- a/modules/labs_bootstrapvz/files/firstboot.sh
+++ b/modules/labs_bootstrapvz/files/firstboot.sh
@@ -65,7 +65,7 @@
 fi
 # At this point, all (the rest of) our disk are belong to LVM.
 
-project=`curl http://169.254.169.254/openstack/latest/meta_data.json/ | sed -r 
's/^.*project-id\": \"//'  | sed -r 's/\".*$//g'`
+project=`curl http://169.254.169.254/openstack/latest/meta_data.json/ | sed -r 
's/^.*project_id\": \"//'  | sed -r 's/\".*$//g'`
 ip=`curl http://169.254.169.254/1.0/meta-data/local-ipv4 2> /dev/null`
 hostname=`hostname`
 # domain is the last two domain sections, e.g. eqiad.wmflabs
diff --git a/modules/labs_vmbuilder/files/firstboot.sh 
b/modules/labs_vmbuilder/files/firstboot.sh
index 0b62c76..a6fb4f9 100644
--- a/modules/labs_vmbuilder/files/firstboot.sh
+++ b/modules/labs_vmbuilder/files/firstboot.sh
@@ -41,7 +41,7 @@
 fi
 # At this point, all (the rest of) our disk are belong to LVM.
 
-project=`curl http://169.254.169.254/openstack/latest/meta_data.json/ | sed -r 
's/^.*project-id\": \"//'  | sed -r 's/\".*$//g'`
+project=`curl http://169.254.169.254/openstack/latest/meta_data.json/ | sed -r 
's/^.*project_id\": \"//'  | sed -r 's/\".*$//g'`
 ip=`curl http://169.254.169.254/1.0/meta-data/local-ipv4 2> /dev/null`
 hostname=`hostname`
 # domain is the last two domain sections, e.g. eqiad.wmflabs

-- 
To view, visit https://gerrit.wikimedia.org/r/307671
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: I0335b5921070bf98f3ff47c5623693eb73ba5064
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Andrew Bogott 

___
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits