Merge "Fixes unable to upload glance images on undercloud"

diff --combined lib/overcloud-deploy-functions.sh
index c717733,3cb2826..0c3f9d4
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -20,8 -20,6 +20,8 @@@ function overcloud_deploy 
        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
      elif [ "${deploy_options_array['vpp']}" == 'True' ]; then
        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_fdio.yaml"
 +    elif [ "${deploy_options_array['vpn']}" == 'true' ]; then
 +      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight_sdnvpn.yaml"
      else
        DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight.yaml"
      fi
@@@ -185,8 -183,9 +185,8 @@@ EO
       DEPLOY_OPTIONS+=" --ntp-server $ntp_server"
    fi
  
 -  if [[ ! "$virtual" == "TRUE" ]]; then
 -     DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
 -  else
 +  DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
 +  if [[ "$virtual" == "TRUE" ]]; then
       DEPLOY_OPTIONS+=" -e virtual-environment.yaml"
    fi
  
@@@ -201,6 -200,10 +201,10 @@@ f
  
  source stackrc
  set -o errexit
+ # Workaround for APEX-207 where sometimes swift proxy is down
+ if ! sudo systemctl status openstack-swift-proxy > /dev/null; then
+   sudo systemctl restart openstack-swift-proxy
+ fi
  echo "Uploading overcloud glance images"
  openstack overcloud image upload
  
@@@ -231,7 -234,6 +235,7 @@@ for dns_server in ${dns_servers}; d
    dns_server_ext="\${dns_server_ext} --dns-nameserver \${dns_server}"
  done
  neutron subnet-update \$(neutron subnet-list | grep -Ev "id|tenant|external|storage" | grep -v \\\\-\\\\- | awk {'print \$2'}) \${dns_server_ext}
 +sed -i '/CloudDomain:/c\  CloudDomain: '${domain_name} opnfv-environment.yaml
  echo "Executing overcloud deployment, this should run for an extended period without output."
  sleep 60 #wait for Hypervisor stats to check-in to nova
  # save deploy command so it can be used for debugging