Merge "Adding tacker support"

diff --combined lib/overcloud-deploy-functions.sh
index 0c3f9d4,b035422..14c3724
--- 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
@@@ -199,12 -197,12 +199,16 @@@ if [ "$debug" == 'TRUE' ]; the
      LIBGUESTFS_BACKEND=direct virt-customize -a overcloud-full.qcow2 --root-password password:opnfvapex
  fi
  
+ if [ "${deploy_options_array['tacker']}" == 'True' ]; then
+     sed -i '/EnableTacker/\\c  EnableTacker: true' opnfv-environment.yaml
+ fi
+ 
  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
  

diff --combined lib/post-install-functions.sh
index 8ccd896,d0f4da4..af72d8f
--- 1/lib/post-install-functions.sh
--- 2/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@@ -67,7 -67,7 +67,7 @@@ EO
    # TODO fix this when HA SDN controllers are supported
    if [ "${deploy_options_array['sdn_controller']}" != 'False' ]; then
      echo -e "${blue}INFO: Finding SDN Controller IP for overcloudrc...${reset}"
 -    sdn_controller_ip=$(overcloud_connect controller0 "facter ipaddress_br_ex")
 +    sdn_controller_ip=$(undercloud_connect stack "source stackrc;nova list | grep controller-0 | cut -d '|' -f 7 | grep -Eo [0-9]+\.[0-9]+\.[0-9]+\.[0-9]+")
      echo -e "${blue}INFO: SDN Controller IP is ${sdn_controller_ip} ${reset}"
      undercloud_connect stack "echo 'export SDN_CONTROLLER_IP=${sdn_controller_ip}' >> /home/stack/overcloudrc"
    fi
@@@ -158,6 -158,11 +158,11 @@@ if [ "$debug" == "TRUE" ]; the
      echo "---------------------------"
      echo "----------END LOG----------"
      echo "---------------------------"
+ 
+     ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" <<EOF
+ echo "$node"
+ sudo openstack-status
+ EOF
  fi
   ssh -T ${SSH_OPTIONS[@]} "heat-admin@\$node" <<EOF
   sudo rm -f /home/heat-admin/messages.log