typo 15/27315/1
authorNarinder Gupta <narinder.gupta@canonical.com>
Fri, 20 Jan 2017 18:37:01 +0000 (12:37 -0600)
committerNarinder Gupta <narinder.gupta@canonical.com>
Fri, 20 Jan 2017 18:37:41 +0000 (12:37 -0600)
Change-Id: Iaaaffd8e0199cb7352c8547845b334e0ae4d4554
Signed-off-by: Narinder Gupta <narinder.gupta@canonical.com>
ci/02-deploybundle.sh
ci/03-maasdeploy.sh

index 26946bd..1bb8e35 100755 (executable)
@@ -40,7 +40,7 @@ check_status() {
        juju status > status.txt
        if [ "$(grep -c "waiting" status.txt )" -ge 4 ]; then
            echo " still waiting for machines ..."
-           if [ $timeoutiter -ge 360 ]; then
+           if [ $timeoutiter -ge 240 ]; then
                retval=1
            fi
            timeoutiter=$((timeoutiter+1))
index 43c188e..2d40d51 100755 (executable)
@@ -168,7 +168,7 @@ mkdir ~/.juju/ || true
 if [ ! -e ~maas/.ssh/id_rsa.pub ]; then
     sudo su - $USER -c "echo |ssh-keygen -t rsa -f $HOME/id_rsa_maas"
     sudo -u maas mkdir ~maas/.ssh/ || true
-    sudo cp $HOME/id_rsa_maas* ~maas/.ssh/id_rsa
+    sudo cp $HOME/id_rsa_maas ~maas/.ssh/id_rsa
     sudo cp $HOME/id_rsa_maas.pub ~maas/.ssh/id_rsa.pub
 fi