openstack
/
fuel-qa
Code Issues Proposed changes

Merge "Replace ALL "tag" parameter with "vlan_start""

This commit is contained in:
Jenkins 2017-03-20 11:26:48 +00:00 committed by Gerrit Code Review
parent 6e43df6df6 dfe698b1a8
commit fec35246d7
10 changed files with 76 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
system_test/tests_templates/devops_configs/centos_master.yaml
View File

@ -68,23 +68,24 @@ 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
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: 120
groups: groups:
- name: default - name: default

11
system_test/tests_templates/devops_configs/default.yaml
View File

@ -68,23 +68,24 @@ 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
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: 120
groups: groups:
- name: default - name: default

20
system_test/tests_templates/devops_configs/default30-2groups.yaml
View File

@ -15,7 +15,7 @@ address_pools:
fuelweb_admin-pool01: fuelweb_admin-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -25,7 +25,7 @@ address_pools:
public-pool01: public-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 100 vlan_start: 100
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -36,7 +36,7 @@ address_pools:
storage-pool01: storage-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 101 vlan_start: 101
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -46,7 +46,7 @@ address_pools:
management-pool01: management-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 102 vlan_start: 102
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -56,7 +56,8 @@ address_pools:
private-pool01: private-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 960 vlan_start: 960
vlan_end: 990
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -66,7 +67,7 @@ address_pools:
public-pool02: public-pool02:
net: *pool_default net: *pool_default
params: params:
tag: 100 vlan_start: 100
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -77,7 +78,7 @@ address_pools:
storage-pool02: storage-pool02:
net: *pool_default net: *pool_default
params: params:
tag: 101 vlan_start: 101
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -87,7 +88,7 @@ address_pools:
management-pool02: management-pool02:
net: *pool_default net: *pool_default
params: params:
tag: 102 vlan_start: 102
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -97,7 +98,8 @@ address_pools:
private-pool02: private-pool02:
net: *pool_default net: *pool_default
params: params:
tag: 960 vlan_start: 960
vlan_end: 990
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address

11
system_test/tests_templates/devops_configs/default30-2groups_.yaml
View File

@ -14,7 +14,7 @@ address_pools:
fuelweb_admin-pool01: fuelweb_admin-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -24,7 +24,7 @@ address_pools:
public-pool01: public-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 100 vlan_start: 100
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -35,15 +35,16 @@ address_pools:
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: 960 vlan_start: 960
vlan_start: 990
groups: groups:

11
system_test/tests_templates/devops_configs/default30-bond.yaml
View File

@ -15,7 +15,7 @@ address_pools:
fuelweb_admin-pool01: fuelweb_admin-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -25,7 +25,7 @@ address_pools:
public-pool01: public-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 100 vlan_start: 100
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -36,15 +36,16 @@ address_pools:
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: 120
groups: groups:
- name: default - name: default

11
system_test/tests_templates/devops_configs/default30.yaml
View File

@ -15,7 +15,7 @@ address_pools:
fuelweb_admin-pool01: fuelweb_admin-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -25,7 +25,7 @@ address_pools:
public-pool01: public-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 100 vlan_start: 100
ip_reserved: ip_reserved:
gateway: +1 gateway: +1
l2_network_device: +1 # l2_network_device will get this IP address l2_network_device: +1 # l2_network_device will get this IP address
@ -36,15 +36,16 @@ address_pools:
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: 120
groups: groups:
- name: default - name: default

29
system_test/tests_templates/devops_configs/external_haproxy.yaml
View File

@ -197,57 +197,60 @@ 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
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: 120
fuelweb_admin-pool02: fuelweb_admin-pool02:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
public-pool02: public-pool02:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
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: 120
fuelweb_admin-pool03: fuelweb_admin-pool03:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
public-pool03: public-pool03:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
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: 120
groups: groups:
- name: default - name: default

13
system_test/tests_templates/devops_configs/public_api.yaml
View File

@ -74,27 +74,28 @@ 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
os-api-pool01: os-api-pool01:
net: *pool_default net: *pool_default
params: params:
tag: 0 vlan_start: 0
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: 120
groups: groups:
- name: default - name: default

11
system_test/tests_templates/devops_configs/security_scan.yaml
View File

@ -68,23 +68,24 @@ template:
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
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: 120
groups: groups:
- name: default - name: default

11
system_test/tests_templates/devops_configs/vcenter_ha_default.yaml
View File

@ -87,23 +87,24 @@ 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
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: 120
groups: groups:
- name: cat - name: cat