Fix vlan_range for multiple networks remplate
Tag is deprecated in fuel_devops. Also we do need vlan_start and vlan_end
for nailgun to work correctly
Closes-bug:1670405
Change-Id: I60e12e65ef3cfb73c9ff78401a785def2e54403d
(cherry picked from commit 59c03f8712
)
This commit is contained in:
parent
5949188f7d
commit
5d0931c8d0
|
@ -175,31 +175,32 @@ address_pools:
|
||||||
fuelweb_admin-pool01:
|
fuelweb_admin-pool01:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 0
|
vlan_start: 0
|
||||||
public-pool01:
|
public-pool01:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 0
|
vlan_start: 0
|
||||||
ip_ranges:
|
ip_ranges:
|
||||||
default: [+2, +31] # public IP range for 'default' nodegroup name
|
default: [+2, +31] # public IP range for 'default' nodegroup name
|
||||||
floating: [+32, -2] # floating IP range for 'default' nodegroup name
|
floating: [+32, -2] # floating IP range for 'default' nodegroup name
|
||||||
storage-pool01:
|
storage-pool01:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 101
|
vlan_start: 101
|
||||||
management-pool01:
|
management-pool01:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 102
|
vlan_start: 102
|
||||||
private-pool01:
|
private-pool01:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 103
|
vlan_start: 103
|
||||||
|
vlan_end: 110
|
||||||
|
|
||||||
fuelweb_admin-pool02:
|
fuelweb_admin-pool02:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 0
|
vlan_start: 0
|
||||||
ip_reserved:
|
ip_reserved:
|
||||||
gateway: +2 # gateway is Fuel master, not libvirt bridge
|
gateway: +2 # gateway is Fuel master, not libvirt bridge
|
||||||
l2_network_device: +1 # l2_network_device will get this IP address
|
l2_network_device: +1 # l2_network_device will get this IP address
|
||||||
|
@ -208,22 +209,23 @@ address_pools:
|
||||||
public-pool02:
|
public-pool02:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 0
|
vlan_start: 0
|
||||||
ip_ranges:
|
ip_ranges:
|
||||||
group-custom-1: [+2, +31] # public IP range for 'group-custom-1' nodegroup name
|
group-custom-1: [+2, +31] # public IP range for 'group-custom-1' nodegroup name
|
||||||
management-pool02:
|
management-pool02:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 102
|
vlan_start: 102
|
||||||
private-pool02:
|
private-pool02:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 103
|
vlan_start: 103
|
||||||
|
vlan_end: 110
|
||||||
|
|
||||||
fuelweb_admin-pool03:
|
fuelweb_admin-pool03:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 0
|
vlan_start: 0
|
||||||
ip_reserved:
|
ip_reserved:
|
||||||
gateway: +2 # gateway is Fuel master, not libvirt bridge
|
gateway: +2 # gateway is Fuel master, not libvirt bridge
|
||||||
l2_network_device: +1 # l2_network_device will get this IP address
|
l2_network_device: +1 # l2_network_device will get this IP address
|
||||||
|
@ -232,17 +234,18 @@ address_pools:
|
||||||
public-pool03:
|
public-pool03:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 0
|
vlan_start: 0
|
||||||
ip_ranges:
|
ip_ranges:
|
||||||
group-custom-2: [+2, +31] # public IP range for 'group-custom-2' nodegroup name
|
group-custom-2: [+2, +31] # public IP range for 'group-custom-2' nodegroup name
|
||||||
management-pool03:
|
management-pool03:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 102
|
vlan_start: 102
|
||||||
private-pool03:
|
private-pool03:
|
||||||
net: *pool_default
|
net: *pool_default
|
||||||
params:
|
params:
|
||||||
tag: 103
|
vlan_start: 103
|
||||||
|
vlan_end: 110
|
||||||
|
|
||||||
groups:
|
groups:
|
||||||
- name: default
|
- name: default
|
||||||
|
|
Loading…
Reference in New Issue