Merge lp:~thomnico/orange-box/newnet into lp:~cpe-sa/orange-box/staging

[Nicolas Thomas]

Add a fix for newly created systems when ubuntu user does not have a .ssh directocry and authorized-keys yet.

[lp:~thomnico/orange-box/newnet]

549. By Nicolas Thomas on 2015-07-21

Remove entries to avoid conflicts

[vio0au0d (chei6ied-deactivatedaccount)]

review: Approve

=== modified file 'usr/bin/orange-box-add-virtual-nodes'
--- usr/bin/orange-box-add-virtual-nodes	2015-07-21 00:17:39 +0000
+++ usr/bin/orange-box-add-virtual-nodes	2015-07-21 17:58:26 +0000
@@ -43,6 +43,13 @@
 [ -f /var/lib/maas/.ssh/known_hosts ] || sudo -u maas ssh-keyscan 172.27.${orangebox_number}.1 |sudo -u maas  tee -a /var/lib/maas/.ssh/known_hosts > /dev/null 
 #Always add host keys .. not an issue if files grows
 sudo -u maas ssh-keyscan 172.27.${orangebox_number}.1 |sudo -u maas  tee -a /var/lib/maas/.ssh/known_hosts > /dev/null 
+# if very first install ubuntu user might not have authorized keys set.
+if [ ! -f /home/ubuntu/.ssh/authorized_keys ]; then
+    mkdir -p /home/ubuntu/.ssh/
+    cat /var/lib/maas/.ssh/id_rsa.pub | tee -a /home/ubuntu/.ssh/authorized_keys
+    chown -R ubuntu /home/ubuntu/.ssh/
+    chmod 700  /home/ubuntu/.ssh/
+fi
 sudo -u maas virsh -c qemu+ssh://ubuntu@172.27.${orangebox_number}.1/system list > /dev/null || sed -i '/ maas@/d' /home/ubuntu/.ssh/authorized_keys
 #If there is no key /new install or just removed add it"
 #echo -e "\n\n\n" | sudo -u maas ssh-keygen -N "" -t rsa -f /var/lib/maas/.ssh/id_rsa