From: Dan Radez <dradez@redhat.com>
Date: Thu, 18 May 2017 19:05:09 +0000 (-0400)
Subject: Missed an update to swap neutron out for openstack cli
X-Git-Tag: opnfv-5.0.0~136^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=733a3a9502ed26c9fc927d935c94d85230ab8e55;p=apex.git

Missed an update to swap neutron out for openstack cli

APEX-432

Change-Id: I787ce844d0d585f55d2267a57642e35f2a47bd40
Signed-off-by: Dan Radez <dradez@redhat.com>
---

diff --git a/lib/overcloud-deploy-functions.sh b/lib/overcloud-deploy-functions.sh
index e125eb62..adaf98a9 100755
--- a/lib/overcloud-deploy-functions.sh
+++ b/lib/overcloud-deploy-functions.sh
@@ -378,7 +378,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