jenkins-bot has submitted this change and it was merged.

Change subject: nodepool: setup commands need root
......................................................................


nodepool: setup commands need root

The bootstrap is done with the debian user. Hence we need to use sudo.

Change-Id: I75b75560f6fb1e532f3c6c197159d65e60b3e697
---
M nodepool/scripts/README
M nodepool/scripts/setup_node.sh
2 files changed, 8 insertions(+), 7 deletions(-)

Approvals:
  Hashar: Looks good to me, approved
  jenkins-bot: Verified



diff --git a/nodepool/scripts/README b/nodepool/scripts/README
index f90e532..ac305bd 100644
--- a/nodepool/scripts/README
+++ b/nodepool/scripts/README
@@ -11,6 +11,8 @@
 Once completed, Nodepool asks OpenStack to snapshot the instance. It will then
 boot instance out of it.
 
+The script is run as the `debian` user which has sudo access.
+
 
 ready.sh
 
diff --git a/nodepool/scripts/setup_node.sh b/nodepool/scripts/setup_node.sh
index fea51c6..42e8221 100755
--- a/nodepool/scripts/setup_node.sh
+++ b/nodepool/scripts/setup_node.sh
@@ -17,12 +17,11 @@
 sudo mkdir -p /opt/nodepool-scripts
 
 echo "Cloning integration/config"
-mkdir -p /opt/git/integration
-git clone /srv/git/integration/config.git /opt/git/integration
-git -C /opt/git/integration/config remote set-url origin 
https://gerrit.wikimedia.org/r/p/integration/config.git
-git -C /opt/git/integration/config pull
+sudo mkdir -p /opt/git/integration
+sudo git clone /srv/git/integration/config.git /opt/git/integration
+sudo git -C /opt/git/integration/config remote set-url origin 
https://gerrit.wikimedia.org/r/p/integration/config.git
+sudo git -C /opt/git/integration/config pull
 
 echo "Running puppet"
-git -C /puppet pull
-
-/usr/local/bin/puppet-apply /opt/git/integration/config/dib/puppet/ciimage.pp
+sudo git -C /puppet pull
+sudo /usr/local/bin/puppet-apply 
/opt/git/integration/config/dib/puppet/ciimage.pp

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

Gerrit-MessageType: merged
Gerrit-Change-Id: I75b75560f6fb1e532f3c6c197159d65e60b3e697
Gerrit-PatchSet: 1
Gerrit-Project: integration/config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot <>

_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits

Reply via email to