From 5b9127cfc14a4bee194c3041693074fe5f7bd675 Mon Sep 17 00:00:00 2001 From: Lukas Bezdicka Date: Wed, 21 Feb 2018 16:23:30 +0100 Subject: [PATCH] Return old ranges to network_data.yaml In change 'Render NIC config templates with jinja2' there was also change of IP ranges for networks. This change is backwards incompatible and it's better to revert the ranges instead of making compatibility workaround. Change-Id: Ifd9f4abaf8b9ac18c251ab8cfba326f2fa92f796 --- network_data.yaml | 16 ++++++++-------- network_data_ganesha.yaml | 16 ++++++++-------- 2 files changed, 16 insertions(+), 16 deletions(-) diff --git a/network_data.yaml b/network_data.yaml index a3a14b65e6..c9c0f88a5b 100644 --- a/network_data.yaml +++ b/network_data.yaml @@ -52,24 +52,24 @@ vip: true vlan: 30 name_lower: storage - ip_subnet: '172.18.0.0/24' - allocation_pools: [{'start': '172.18.0.10', 'end': '172.18.0.250'}] + ip_subnet: '172.16.1.0/24' + allocation_pools: [{'start': '172.16.1.4', 'end': '172.16.1.250'}] ipv6_subnet: 'fd00:fd00:fd00:3000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}] - name: StorageMgmt name_lower: storage_mgmt vip: true vlan: 40 - ip_subnet: '172.19.0.0/24' - allocation_pools: [{'start': '172.19.0.10', 'end': '172.19.0.250'}] + ip_subnet: '172.16.3.0/24' + allocation_pools: [{'start': '172.16.3.4', 'end': '172.16.3.250'}] ipv6_subnet: 'fd00:fd00:fd00:4000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}] - name: InternalApi name_lower: internal_api vip: true vlan: 20 - ip_subnet: '172.17.0.0/24' - allocation_pools: [{'start': '172.17.0.10', 'end': '172.17.0.250'}] + ip_subnet: '172.16.2.0/24' + allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}] ipv6_subnet: 'fd00:fd00:fd00:2000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}] - name: Tenant @@ -77,7 +77,7 @@ name_lower: tenant vlan: 50 ip_subnet: '172.16.0.0/24' - allocation_pools: [{'start': '172.16.0.10', 'end': '172.16.0.250'}] + allocation_pools: [{'start': '172.16.0.4', 'end': '172.16.0.250'}] # Note that tenant tunneling is only compatible with IPv4 addressing at this time. ipv6_subnet: 'fd00:fd00:fd00:5000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}] @@ -86,7 +86,7 @@ name_lower: external vlan: 10 ip_subnet: '10.0.0.0/24' - allocation_pools: [{'start': '10.0.0.10', 'end': '10.0.0.50'}] + allocation_pools: [{'start': '10.0.0.4', 'end': '10.0.0.250'}] gateway_ip: '10.0.0.1' ipv6_subnet: '2001:db8:fd00:1000::/64' ipv6_allocation_pools: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}] diff --git a/network_data_ganesha.yaml b/network_data_ganesha.yaml index 5f182fc2fc..f2c3322c15 100644 --- a/network_data_ganesha.yaml +++ b/network_data_ganesha.yaml @@ -52,24 +52,24 @@ vip: true vlan: 30 name_lower: storage - ip_subnet: '172.18.0.0/24' - allocation_pools: [{'start': '172.18.0.10', 'end': '172.18.0.250'}] + ip_subnet: '172.16.1.0/24' + allocation_pools: [{'start': '172.16.1.4', 'end': '172.16.1.250'}] ipv6_subnet: 'fd00:fd00:fd00:3000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}] - name: StorageMgmt name_lower: storage_mgmt vip: true vlan: 40 - ip_subnet: '172.19.0.0/24' - allocation_pools: [{'start': '172.19.0.10', 'end': '172.19.0.250'}] + ip_subnet: '172.16.3.0/24' + allocation_pools: [{'start': '172.16.3.4', 'end': '172.16.3.250'}] ipv6_subnet: 'fd00:fd00:fd00:4000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}] - name: InternalApi name_lower: internal_api vip: true vlan: 20 - ip_subnet: '172.17.0.0/24' - allocation_pools: [{'start': '172.17.0.10', 'end': '172.17.0.250'}] + ip_subnet: '172.16.2.0/24' + allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}] ipv6_subnet: 'fd00:fd00:fd00:2000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}] - name: Tenant @@ -77,7 +77,7 @@ name_lower: tenant vlan: 50 ip_subnet: '172.16.0.0/24' - allocation_pools: [{'start': '172.16.0.10', 'end': '172.16.0.250'}] + allocation_pools: [{'start': '172.16.0.4', 'end': '172.16.0.250'}] # Note that tenant tunneling is only compatible with IPv4 addressing at this time. ipv6_subnet: 'fd00:fd00:fd00:5000::/64' ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:5000::10', 'end': 'fd00:fd00:fd00:5000:ffff:ffff:ffff:fffe'}] @@ -86,7 +86,7 @@ name_lower: external vlan: 10 ip_subnet: '10.0.0.0/24' - allocation_pools: [{'start': '10.0.0.10', 'end': '10.0.0.50'}] + allocation_pools: [{'start': '10.0.0.4', 'end': '10.0.0.250'}] gateway_ip: '10.0.0.1' ipv6_subnet: '2001:db8:fd00:1000::/64' ipv6_allocation_pools: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]