fix neutron configuration for pike

Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
conjure-up · Sep 20, 2017 · 0a309c0 · 0a309c0
1 parent 87d9861
commit 0a309c0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/openstack-novalxd/steps/share/neutron.sh b/openstack-novalxd/steps/share/neutron.sh
@@ -12,9 +12,9 @@ fi
 
 if ! neutron subnet-show ext-subnet > /dev/null 2>&1; then
     debug "adding ext-subnet"
-    if ! neutron subnet-create --name ext-subnet ext-net "$LXD_NETWORK" \
+    if ! neutron subnet-create --name ext-subnet  \
              --gateway "$LXD_GATEWAY" --disable-dhcp \
-             --allocation-pool start="$LXD_DHCP_RANGE_START",end="$LXD_DHCP_RANGE_STOP" > /dev/null 2>&1; then
+             --allocation-pool start="$LXD_DHCP_RANGE_START",end="$LXD_DHCP_RANGE_STOP" ext-net "$LXD_NETWORK"; then
         debug "could not subnet-create ext-subnet"
     fi
 fi

diff --git a/openstack-novalxd/steps/step-04_neutron b/openstack-novalxd/steps/step-04_neutron
@@ -6,7 +6,7 @@ tmpfile=$(mktemp)
 
 $(scriptPath)/share/novarc > "$tmpfile"
 
-LXD_NETWORK=$(getKey "lxd-network-name")
+LXD_NETWORK=$(getKey "lxd-network")
 LXD_GATEWAY=$(getKey "lxd-gateway")
 LXD_DHCP_RANGE_START=$(getKey "lxd-network-dhcp-range-start")
 LXD_DHCP_RANGE_STOP=$(getKey "lxd-network-dhcp-range-stop")