From 90ea5f2b920cc7f8505bca4ec59faec7a3f47455 Mon Sep 17 00:00:00 2001 From: Derek Higgins Date: Thu, 8 Mar 2018 14:39:54 +0000 Subject: [PATCH] Don't include host_routes when creating a IPv6 subnet This wasn't include in the bash version and was incorrecly added when it was converted to python in I0168991a0fbd9dacf708ba2bdbc13248414affbe Closes-Bug: #1754681 Change-Id: I41e37346122b0acaffb72fad34519e9e9828f61e --- instack_undercloud/undercloud.py | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/instack_undercloud/undercloud.py b/instack_undercloud/undercloud.py index b3f7aab20..54fec8d49 100644 --- a/instack_undercloud/undercloud.py +++ b/instack_undercloud/undercloud.py @@ -2046,12 +2046,10 @@ def _neutron_subnet_create(sdk, network_id, cidr, gateway, host_routes, try: # DHCP_START contains a ":" then assume a IPv6 subnet if ':' in allocation_pool[0]['start']: - host_routes = '' subnet = sdk.network.create_subnet( name=name, cidr=cidr, gateway_ip=gateway, - host_routes=host_routes, enable_dhcp=True, ip_version='6', ipv6_address_mode='dhcpv6-stateless', @@ -2080,16 +2078,14 @@ def _neutron_subnet_create(sdk, network_id, cidr, gateway, host_routes, def _neutron_subnet_update(sdk, subnet_id, gateway, host_routes, allocation_pool, name): + update_values = {'name': name, 'gateway_ip': gateway, + 'host_routes': host_routes, + 'allocation_pools': allocation_pool} try: # DHCP_START contains a ":" then assume a IPv6 subnet if ':' in allocation_pool[0]['start']: - host_routes = '' - subnet = sdk.network.update_subnet( - subnet_id, - name=name, - gateway_ip=gateway, - host_routes=host_routes, - allocation_pools=allocation_pool) + del update_values['host_routes'] + subnet = sdk.network.update_subnet(subnet_id, **update_values) LOG.info("Subnet updated %s", subnet) except Exception as e: LOG.error("Update subnet %s failed: %s", name, e)