Merge "Migrate to stable/newton"

diff --cc build/Makefile
Simple merge

diff --cc build/overcloud-full.sh
Simple merge

diff --cc build/variables.sh
Simple merge

diff --cc lib/overcloud-deploy-functions.sh
index 8fe2b85,1a363e6..516dac9
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -26,9 -24,17 +24,9 @@@ function overcloud_deploy 
      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"
+       DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/neutron-opendaylight-l3.yaml"
      fi
      SDN_IMAGE=opendaylight
 -    if [ "${deploy_options_array['sfc']}" == 'True' ]; then
 -      SDN_IMAGE+=-sfc
 -      if [ ! -f $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 ]; then
 -          echo "${red} $RESOURCES/overcloud-full-${SDN_IMAGE}.qcow2 is required to execute an SFC deployment."
 -          echo "Please install the opnfv-apex-opendaylight-sfc package to provide this overcloud image for deployment.${reset}"
 -          exit 1
 -      fi
 -    fi
    elif [ "${deploy_options_array['sdn_controller']}" == 'opendaylight-external' ]; then
      DEPLOY_OPTIONS+=" -e /usr/share/openstack-tripleo-heat-templates/environments/opendaylight-external.yaml"
      SDN_IMAGE=opendaylight