diff options
| -rwxr-xr-x | build/undercloud.sh | 2 | ||||
| -rwxr-xr-x | ci/deploy.sh | 1 | ||||
| -rwxr-xr-x | lib/overcloud-deploy-functions.sh | 2 | ||||
| -rwxr-xr-x | lib/post-install-functions.sh | 2 | ||||
| -rwxr-xr-x | lib/undercloud-functions.sh | 4 | ||||
| -rw-r--r-- | lib/utility-functions.sh | 8 |
6 files changed, 10 insertions, 9 deletions
diff --git a/build/undercloud.sh b/build/undercloud.sh index eaa3b501..a2bb9c60 100755 --- a/build/undercloud.sh +++ b/build/undercloud.sh @@ -32,6 +32,8 @@ pushd images > /dev/null # add tacker password to python-tripleoclient # upload tacker repo and install the client package LIBGUESTFS_BACKEND=direct virt-customize \ + --run-command "sed -i 's/^#UseDNS.*$/UseDNS no/' /etc/ssh/sshd_config" \ + --run-command "sed -i 's/^GSSAPIAuthentication.*$/GSSAPIAuthentication no/' /etc/ssh/sshd_config" \ --upload ../opnfv-tht.tar.gz:/usr/share \ --install "openstack-utils" \ --install "ceph-common" \ diff --git a/ci/deploy.sh b/ci/deploy.sh index 6d3ded02..482e134b 100755 --- a/ci/deploy.sh +++ b/ci/deploy.sh @@ -83,7 +83,6 @@ display_usage() { echo -e " --net-settings | -n : Full path to network settings file. Optional." echo -e " --ping-site | -p : site to use to verify IP connectivity. Optional. Defaults to 8.8.8.8" echo -e " --virtual | -v : Virtualize overcloud nodes instead of using baremetal." - echo -e " --flat : disable Network Isolation and use a single flat network for the underlay network." echo -e " --no-post-config : disable Post Install configuration." echo -e " --debug : enable debug output." echo -e " --interactive : enable interactive deployment mode which requires user to confirm steps of deployment." diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh index 516dac97..4b592b46 100755 --- a/lib/overcloud-deploy-functions.sh +++ b/lib/overcloud-deploy-functions.sh @@ -319,7 +319,7 @@ EOI ssh -T ${SSH_OPTIONS[@]} "stack@$UNDERCLOUD" <<EOI source stackrc openstack overcloud deploy --templates $DEPLOY_OPTIONS --timeout 90 -if ! heat stack-list | grep CREATE_COMPLETE 1>/dev/null; then +if ! openstack stack list | grep CREATE_COMPLETE 1>/dev/null; then $(typeset -f debug_stack) debug_stack exit 1 diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh index d21b8366..604eb70d 100755 --- a/lib/post-install-functions.sh +++ b/lib/post-install-functions.sh @@ -208,7 +208,7 @@ done # Print out the undercloud IP and dashboard URL source stackrc echo "Undercloud IP: $UNDERCLOUD, please connect by doing 'opnfv-util undercloud'" -echo "Overcloud dashboard available at http://\$(heat output-show overcloud PublicVip | sed 's/"//g')/dashboard" +echo "Overcloud dashboard available at http://\$(openstack stack output show overcloud PublicVip | sed 's/"//g')/dashboard" EOI if [[ "$ha_enabled" == 'True' ]]; then diff --git a/lib/undercloud-functions.sh b/lib/undercloud-functions.sh index 6ba9a545..d3beb60c 100755 --- a/lib/undercloud-functions.sh +++ b/lib/undercloud-functions.sh @@ -71,12 +71,12 @@ function setup_undercloud_vm { CNT=10 echo -n "${blue}Waiting for Undercloud's dhcp address${reset}" undercloud_mac=$(virsh domiflist undercloud | grep default | awk '{ print $5 }') - while ! $(arp -e | grep ${undercloud_mac} > /dev/null) && [ $CNT -gt 0 ]; do + while ! $(arp -en | grep ${undercloud_mac} > /dev/null) && [ $CNT -gt 0 ]; do echo -n "." sleep 10 CNT=$((CNT-1)) done - UNDERCLOUD=$(arp -e | grep ${undercloud_mac} | awk {'print $1'}) + UNDERCLOUD=$(arp -en | grep ${undercloud_mac} | awk {'print $1'}) if [ -z "$UNDERCLOUD" ]; then echo "\n\nCan't get IP for Undercloud. Can Not Continue." diff --git a/lib/utility-functions.sh b/lib/utility-functions.sh index bc9a9592..5c28b46c 100644 --- a/lib/utility-functions.sh +++ b/lib/utility-functions.sh @@ -24,7 +24,7 @@ function undercloud_connect { ##outputs the Undercloud's IP address ##params: none function get_undercloud_ip { - echo $(arp -a | grep $(virsh domiflist undercloud | grep default |\ + echo $(arp -an | grep $(virsh domiflist undercloud | grep default |\ awk '{print $5}') | grep -Eo "[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+") } @@ -88,14 +88,14 @@ function debug_stack { source ~/stackrc IFS=$'\n' - for resource in $(heat resource-list -n 5 overcloud | grep FAILED); do + for resource in $(openstack stack resource list -n 5 overcloud | grep FAILED); do unset IFS resource_arr=(${resource//|/ }) - phys_id=$(heat resource-show ${resource_arr[-1]} ${resource_arr[0]} | grep physical_resource_id 2> /dev/null) + phys_id=$(openstack stack resource show ${resource_arr[-1]} ${resource_arr[0]} | grep physical_resource_id 2> /dev/null) if [ -n "$phys_id" ]; then phys_id_arr=(${phys_id//|/ }) failure_output+="******************************************************" - failure_output+="\n${resource}:\n\n$(heat deployment-show ${phys_id_arr[-1]} 2> /dev/null)" + failure_output+="\n${resource}:\n\n$(openstack stack deployment show ${phys_id_arr[-1]} 2> /dev/null)" failure_output+="\n******************************************************" fi unset phys_id |