Merge "Missed an update to swap neutron out for openstack cli"

diff --combined lib/overcloud-deploy-functions.sh
index ab0421f,adaf98a..cdf9de0
--- 1/lib/overcloud-deploy-functions.sh
--- 2/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@@ -328,11 -328,8 +328,11 @@@ EO
    DEPLOY_OPTIONS+=" --control-flavor control --compute-flavor compute"
    if [[ "$virtual" == "TRUE" ]]; then
       DEPLOY_OPTIONS+=" -e virtual-environment.yaml"
 -     # double check the status of the vbmc devices
 -     # TODO add some validation logic here
 +     echo 'Ensuring Virtual BMC device status'
 +     for i in $(vbmc list | grep down | awk '{ print $2}'); do
 +         vbmc start $i
 +         sleep 5
 +     done
       vbmc list
    fi
  
@@@ -381,7 -378,7 +381,7 @@@ dns_server_ext='
  for dns_server in ${dns_servers}; do
    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}
+ openstack subnet set ctlplane-subnet \${dns_server_ext}
  sed -i '/CloudDomain:/c\  CloudDomain: '${domain_name} ${ENV_FILE}
  echo "Executing overcloud deployment, this could run for an extended period without output."
  sleep 60 #wait for Hypervisor stats to check-in to nova