From 8d79d808cde15755a69bfb432ea925f1b670ea0c Mon Sep 17 00:00:00 2001
From: Yossi Boaron <yossi.boaron.1234@gmail.com>
Date: Thu, 16 Aug 2018 09:26:29 +0300
Subject: [PATCH] OCP-Router: fix external network bug in devstack

Closes-Bug: #1787334

Change-Id: Ic61d091a89f5fc7bee9052c949ba2c6b2ca93e74
(cherry picked from commit 579cdf102247ed85dbce00b045795a6f5d1d9383)
---
 devstack/plugin.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 52efa673f..ff9d6ce9e 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -753,7 +753,8 @@ function create_ingress_l7_router {
     l7_router_fip=$(openstack --os-cloud devstack-admin \
            --os-region "$REGION_NAME" \
            floating ip create --project "$project_id" \
-            --subnet "${ext_svc_subnet_id}"  "${ext_svc_net_id}" \
+            --subnet "$KURYR_NEUTRON_DEFAULT_EXT_SVC_SUBNET" \
+             "$KURYR_NEUTRON_DEFAULT_EXT_SVC_NET" \
             -f value -c floating_ip_address)
 
     openstack  --os-cloud devstack-admin \