openstack/tripleo-heat-templates
Code Issues Proposed changes

Return old ranges to network_data.yaml

Browse Source 
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
This commit is contained in:
Lukas Bezdicka 2018-02-21 16:23:30 +01:00
parent f85cefec43
commit 5b9127cfc1
2 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
network_data.yaml
View File

@ -52,24 +52,24 @@
vip: true vip: true
vlan: 30 vlan: 30
name_lower: storage name_lower: storage
ip_subnet: '172.18.0.0/24' ip_subnet: '172.16.1.0/24'
allocation_pools: [{'start': '172.18.0.10', 'end': '172.18.0.250'}] allocation_pools: [{'start': '172.16.1.4', 'end': '172.16.1.250'}]
ipv6_subnet: 'fd00:fd00:fd00:3000::/64' 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'}] ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}]
- name: StorageMgmt - name: StorageMgmt
name_lower: storage_mgmt name_lower: storage_mgmt
vip: true vip: true
vlan: 40 vlan: 40
ip_subnet: '172.19.0.0/24' ip_subnet: '172.16.3.0/24'
allocation_pools: [{'start': '172.19.0.10', 'end': '172.19.0.250'}] allocation_pools: [{'start': '172.16.3.4', 'end': '172.16.3.250'}]
ipv6_subnet: 'fd00:fd00:fd00:4000::/64' 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'}] ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}]
- name: InternalApi - name: InternalApi
name_lower: internal_api name_lower: internal_api
vip: true vip: true
vlan: 20 vlan: 20
ip_subnet: '172.17.0.0/24' ip_subnet: '172.16.2.0/24'
allocation_pools: [{'start': '172.17.0.10', 'end': '172.17.0.250'}] allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}]
ipv6_subnet: 'fd00:fd00:fd00:2000::/64' 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'}] ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
- name: Tenant - name: Tenant
@ -77,7 +77,7 @@
name_lower: tenant name_lower: tenant
vlan: 50 vlan: 50
ip_subnet: '172.16.0.0/24' 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. # Note that tenant tunneling is only compatible with IPv4 addressing at this time.
ipv6_subnet: 'fd00:fd00:fd00:5000::/64' 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'}] 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 name_lower: external
vlan: 10 vlan: 10
ip_subnet: '10.0.0.0/24' 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' gateway_ip: '10.0.0.1'
ipv6_subnet: '2001:db8:fd00:1000::/64' 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'}] ipv6_allocation_pools: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]

16
network_data_ganesha.yaml
View File

@ -52,24 +52,24 @@
vip: true vip: true
vlan: 30 vlan: 30
name_lower: storage name_lower: storage
ip_subnet: '172.18.0.0/24' ip_subnet: '172.16.1.0/24'
allocation_pools: [{'start': '172.18.0.10', 'end': '172.18.0.250'}] allocation_pools: [{'start': '172.16.1.4', 'end': '172.16.1.250'}]
ipv6_subnet: 'fd00:fd00:fd00:3000::/64' 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'}] ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:3000::10', 'end': 'fd00:fd00:fd00:3000:ffff:ffff:ffff:fffe'}]
- name: StorageMgmt - name: StorageMgmt
name_lower: storage_mgmt name_lower: storage_mgmt
vip: true vip: true
vlan: 40 vlan: 40
ip_subnet: '172.19.0.0/24' ip_subnet: '172.16.3.0/24'
allocation_pools: [{'start': '172.19.0.10', 'end': '172.19.0.250'}] allocation_pools: [{'start': '172.16.3.4', 'end': '172.16.3.250'}]
ipv6_subnet: 'fd00:fd00:fd00:4000::/64' 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'}] ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:4000::10', 'end': 'fd00:fd00:fd00:4000:ffff:ffff:ffff:fffe'}]
- name: InternalApi - name: InternalApi
name_lower: internal_api name_lower: internal_api
vip: true vip: true
vlan: 20 vlan: 20
ip_subnet: '172.17.0.0/24' ip_subnet: '172.16.2.0/24'
allocation_pools: [{'start': '172.17.0.10', 'end': '172.17.0.250'}] allocation_pools: [{'start': '172.16.2.4', 'end': '172.16.2.250'}]
ipv6_subnet: 'fd00:fd00:fd00:2000::/64' 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'}] ipv6_allocation_pools: [{'start': 'fd00:fd00:fd00:2000::10', 'end': 'fd00:fd00:fd00:2000:ffff:ffff:ffff:fffe'}]
- name: Tenant - name: Tenant
@ -77,7 +77,7 @@
name_lower: tenant name_lower: tenant
vlan: 50 vlan: 50
ip_subnet: '172.16.0.0/24' 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. # Note that tenant tunneling is only compatible with IPv4 addressing at this time.
ipv6_subnet: 'fd00:fd00:fd00:5000::/64' 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'}] 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 name_lower: external
vlan: 10 vlan: 10
ip_subnet: '10.0.0.0/24' 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' gateway_ip: '10.0.0.1'
ipv6_subnet: '2001:db8:fd00:1000::/64' 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'}] ipv6_allocation_pools: [{'start': '2001:db8:fd00:1000::10', 'end': '2001:db8:fd00:1000:ffff:ffff:ffff:fffe'}]