DevStack bug fixes

Author: alexpilotti

configure-devstack.sh

@@ -83,14 +83,14 @@ run_ssh_cmd_with_retry $ADMIN_USER@$CONTROLLER_VM_IP "sudo cp crudini/crudini /u
 
 echo "Getting Nova config options for Hyper-V"
 
-RPC_BACKEND_HOST=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT rabbit_host $NOVA_CONF_FILE`
-RPC_BACKEND_PASSWORD=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT rabbit_password $NOVA_CONF_FILE`
-
-NEUTRON_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT neutron_url $NOVA_CONF_FILE`
-NEUTRON_ADMIN_AUTH_URL=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT neutron_admin_auth_url $NOVA_CONF_FILE`
-NEUTRON_ADMIN_TENANT_NAME=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT neutron_admin_tenant_name $NOVA_CONF_FILE`
-NEUTRON_ADMIN_USERNAME=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT neutron_admin_username $NOVA_CONF_FILE`
-NEUTRON_ADMIN_PASSWORD=`get_openstack_option_value $RDO_ADMIN@$CONTROLLER_VM_IP DEFAULT neutron_admin_password $NOVA_CONF_FILE`
+RPC_BACKEND_HOST=`get_openstack_option_value $ADMIN_USER@$CONTROLLER_VM_IP DEFAULT rabbit_host $NOVA_CONF_FILE`
+RPC_BACKEND_PASSWORD=`get_openstack_option_value $ADMIN_USER@$CONTROLLER_VM_IP DEFAULT rabbit_password $NOVA_CONF_FILE`
+
+NEUTRON_URL=`get_openstack_option_value $ADMIN_USER@$CONTROLLER_VM_IP DEFAULT neutron_url $NOVA_CONF_FILE`
+NEUTRON_ADMIN_AUTH_URL=`get_openstack_option_value $ADMIN_USER@$CONTROLLER_VM_IP DEFAULT neutron_admin_auth_url $NOVA_CONF_FILE`
+NEUTRON_ADMIN_TENANT_NAME=`get_openstack_option_value $ADMIN_USER@$CONTROLLER_VM_IP DEFAULT neutron_admin_tenant_name $NOVA_CONF_FILE`
+NEUTRON_ADMIN_USERNAME=`get_openstack_option_value $ADMIN_USER@$CONTROLLER_VM_IP DEFAULT neutron_admin_username $NOVA_CONF_FILE`
+NEUTRON_ADMIN_PASSWORD=`get_openstack_option_value $ADMIN_USER@$CONTROLLER_VM_IP DEFAULT neutron_admin_password $NOVA_CONF_FILE`
 
 # TODO: read Glance host/port from nova.conf
 GLANCE_HOST=$CONTROLLER_VM_IP

deploy-devstack-example.sh

@@ -11,8 +11,6 @@ ESXI_HOST=$2
 VMDK_OPTION=$3
 
 DEVSTACK_NAME=devstack-test-$RANDOM
-ESXI_HOST=10.7.2.2
-ESXI_USER=root
 
 DATASTORE=datastore1
 ESXI_PUBLIC_SWITCH=vSwitch0

sshpass.sh

@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 set -e
 
 if [ $# -lt 2 ]; then
@@ -8,10 +8,10 @@ fi
 
 SSHUSER_HOST=$1
 PWD=$2
-ARGS=$3
+ARGS="${@:3}"
 
 /usr/bin/expect <<EOD
-spawn ssh -oStrictHostKeyChecking=no -oCheckHostIP=no $SSHUSER_HOST "$ARGS"
+spawn ssh -oStrictHostKeyChecking=no -oCheckHostIP=no $SSHUSER_HOST $ARGS
 expect "password"
 send "$PWD\n" 
 expect eof

utils.sh

@@ -1,14 +1,13 @@
 echoerr() { echo "$@" 1>&2; }
 
-exec_with_retry () {
-    CMD=$1
-    MAX_RETRIES=${2-10}
-    INTERVAL=$3
+exec_with_retry2 () {
+    MAX_RETRIES=$1
+    INTERVAL=$2
 
     COUNTER=0
     while [ $COUNTER -lt $MAX_RETRIES ]; do
         EXIT=0
-        eval '$CMD' || EXIT=$?
+        eval '${@:3}' || EXIT=$?
         if [ $EXIT -eq 0 ]; then
             return 0
         fi
@@ -21,6 +20,14 @@ exec_with_retry () {
     return $EXIT
 }
 
+exec_with_retry () {
+    CMD=$1
+    MAX_RETRIES=${2-10}
+    INTERVAL=${3-0}
+
+    exec_with_retry2 $MAX_RETRIES $INTERVAL $CMD
+}     
+
 run_wsmancmd_with_retry () {
     HOST=$1
     USERNAME=$2
@@ -136,19 +143,21 @@ configure_ssh_pubkey_auth () {
 
     MAX_WAIT_SECONDS=300
 
+    PUBKEYFILE=`mktemp -u /tmp/ssh_key_pub.XXXXXX`
+
     ssh-keygen -R $HOST
 
     wait_for_listening_port $HOST 22 $MAX_WAIT_SECONDS
-    $BASEDIR/scppass.sh $SSH_KEY_FILE_PUB $USERNAME@$HOST:$SSH_KEY_FILE_PUB "$PASSWORD"
-    $BASEDIR/sshpass.sh $USERNAME@$HOST "$PASSWORD" "mkdir -p ~/.ssh && chmod 700 ~/.ssh && cat $SSH_KEY_FILE_PUB >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys && (\[ ! -x /sbin/restorecon \] || restorecon -R -v ~/.ssh)"
+    exec_with_retry2 10 0 $BASEDIR/scppass.sh $SSH_KEY_FILE_PUB $USERNAME@$HOST:$PUBKEYFILE "$PASSWORD"
+    exec_with_retry2 10 0 $BASEDIR/sshpass.sh $USERNAME@$HOST "$PASSWORD" "mkdir -p ~/.ssh && chmod 700 ~/.ssh && cat $PUBKEYFILE >> ~/.ssh/authorized_keys && chmod 600 ~/.ssh/authorized_keys && (\[ ! -x /sbin/restorecon \] || restorecon -R -v ~/.ssh)"
 }
 
 disable_sudo_password_prompt () {
     SSHUSER_HOST=$1
     SSH_KEY_FILE=$2
     PWD=$3
 
-    /usr/bin/expect <<EOD
+    exec_with_retry2 10 0 /usr/bin/expect <<EOD
 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"