coren has uploaded a new change for review.

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

Change subject: Tweaks to instance build postint.sh
......................................................................

Tweaks to instance build postint.sh

- nfs-client rather than glusterfs-client
- add new_install root key early for debugging

Change-Id: I483ce66327c8c0c64259d0fb064833224ee5e9f9
---
M modules/labs_vmbuilder/files/postinst.sh
1 file changed, 4 insertions(+), 1 deletion(-)


  git pull ssh://gerrit.wikimedia.org:29418/operations/puppet 
refs/changes/58/114458/1

diff --git a/modules/labs_vmbuilder/files/postinst.sh 
b/modules/labs_vmbuilder/files/postinst.sh
index fc1e9a4..f7addc9 100644
--- a/modules/labs_vmbuilder/files/postinst.sh
+++ b/modules/labs_vmbuilder/files/postinst.sh
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+chroot $1 mkdir -p /root/.ssh
+chroot $1 echo 'ssh-rsa 
AAAAB3NzaC1yc2EAAAABIwAAAgEAqWmdNQm1reC0jxfBof510S6ffw/BDIXyFM38ij3PnkYEBOE4PB3KeHJN7NxUbWaXPBILxtqq5EUnCL9XQnDx82opCC9nChNO5KAoV3VqwNAAfh2UVFPt4PKLXiJjU9k76acp+s3i7uEG0wOVlsggjmbsiBq/Jwkne9oodhA75go1GVeDrP5WsXBGYcXXdjY8uU1P901YIatJoYYQSOOsGngGRZPUbTeFrGBaaoQsRCIiE1/byWs5yUuTbWjsBYDK+FoQsmmG5C98tN2g0llLhdbHTVutDEsvRLf28s3RGTTskfYhMgHbpA3coMIKvG8f2gWuk0wgMzI6G69BO87PsdyaS0aNn/DQILRBGaWTIbZwvjecCxXhXsJx0h1fdhTeXZAHljuY2s/7r8LXLk2eLzDi7RIO4PNtUrlRMZ9DgXFupfJXQSJiE54GCMHIHJ5qqGEveJFg7GZXlyxMDm2wUPyw2YYtQcM/RamnyEjakUM7X3eF45gY4ewabp+3IpP2iqkH3gz7IE/8aXtmqwa+SHNl1KxmGZ+9FFOuByM8wvDWaV320569ZGVAy9dxaH/mClLMx+xUKDxa4JN9dn9Yi+hnKoUhOYaBYXB+aPwydjTLMzp7rr1RgrLVGNk1R9WS2RHnEOSYxDmZbAht3v81F/c4mlzBQHQmXBKnNIxdHis=
 new_install' >>/root/.ssh/authorized_keys
+chroot $1 chmod -R go= /root/.ssh
 chroot $1 echo '' > /etc/resolvconf/resolv.conf.d/original
 chroot $1 passwd -ld root
 chroot $1 passwd -ld ubuntu
@@ -8,7 +11,7 @@
 chroot $1 apt-get update
 chroot $1 /root/install_sudo.sh
 chroot $1 rm /root/install_sudo.sh
-chroot $1 apt-get install -y puppet puppet-common facter glusterfs-client 
salt-minion
+chroot $1 apt-get install -y puppet puppet-common facter nfs-client salt-minion
 chroot $1 /etc/init.d/salt-minion stop
 chroot $1 mv /etc/puppet/puppet.conf.install /etc/puppet/puppet.conf
 chroot $1 mv /etc/default/puppet.install /etc/default/puppet

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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I483ce66327c8c0c64259d0fb064833224ee5e9f9
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: coren <[email protected]>

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

Reply via email to