Devstack bug fixes

Author: alexpilotti

configure-devstack.sh

@@ -29,7 +29,7 @@ echo "Configuring SSH public key authentication"
 configure_ssh_pubkey_auth $ADMIN_USER $CONTROLLER_VM_IP $SSH_KEY_FILE_PUB $ADMIN_PASSWORD
 
 echo "Disabling sudo password prompt"
-disable_sudo_password_prompt $ADMIN_USER@$CONTROLLER_VM_IP $ADMIN_PASSWORD
+disable_sudo_password_prompt $ADMIN_USER@$CONTROLLER_VM_IP $SSH_KEY_FILE $ADMIN_PASSWORD
 
 echo "Setting host name"
 set_hostname_ubuntu $ADMIN_USER@$CONTROLLER_VM_IP $CONTROLLER_VM_NAME

deploy-devstack.sh

@@ -23,7 +23,7 @@ BASEDIR=$(dirname $0)
 ssh $ESXI_USER@$ESXI_HOST $ESXI_BASEDIR/deploy-devstack-esxi-vms.sh $DATASTORE $DEVSTACK_NAME $ESXI_PUBLIC_SWITCH $ESXI_PUBLIC_VNIC "$LINUX_TEMPLATE_VMDK" "$HYPERV_TEMPLATE_VMDK" $VM_IPS_FILE
 read CONTROLLER_VM_NAME CONTROLLER_VM_IP HYPERV_COMPUTE_VM_NAME HYPERV_COMPUTE_VM_IP <<< `ssh $ESXI_USER@$ESXI_HOST "cat $VM_IPS_FILE" | perl -n -e'/^(.+)\:(.+)$/ && print "$1\n$2\n"'`
 
-SSH_KEY_FILE=`mktemp -u /tmp/rdo_ssh_key.XXXXXX`
+SSH_KEY_FILE=`mktemp -u /tmp/devstack_ssh_key.XXXXXX`
 ssh-keygen -q -t rsa -f $SSH_KEY_FILE -N "" -b 4096
 
 $BASEDIR/configure-devstack.sh $SSH_KEY_FILE $CONTROLLER_VM_NAME $CONTROLLER_VM_IP $HYPERV_COMPUTE_VM_NAME $HYPERV_COMPUTE_VM_IP

utils.sh

@@ -145,10 +145,11 @@ configure_ssh_pubkey_auth () {
 
 disable_sudo_password_prompt () {
     SSHUSER_HOST=$1
-    PWD=$2
+    SSH_KEY_FILE=$2
+    PWD=$3
 
     /usr/bin/expect <<EOD
-spawn ssh -oStrictHostKeyChecking=no -oCheckHostIP=no -t $SSHUSER_HOST "sudo sh -c 'echo \"%sudo ALL=(ALL) NOPASSWD: ALL\" > /etc/sudoers.d/devstack-deploy'"
+spawn ssh -oStrictHostKeyChecking=no -oCheckHostIP=no -i $SSH_KEY_FILE -t $SSHUSER_HOST "sudo sh -c 'echo \"%sudo ALL=(ALL) NOPASSWD: ALL\" >> /etc/sudoers'"
 expect "password"
 send "$PWD\n" 
 expect eof