openstack/fuel-qa
Code Issues Proposed changes

Add interface_model to devops templates.

Browse Source 
interface_model is a required field.
It must be specified in devops template file.

Change-Id: I11ced94b21b949ef34b4cba2d0aecd2a6c76d36b
This commit is contained in:
Anton Studenov 2016-02-26 13:25:32 +03:00
parent b340f64e94
commit efbe9dcd15
2 changed files with 30 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -4,17 +4,25 @@ aliases:
dynamic_address_pool:
- &pool_default !os_env POOL_DEFAULT, 10.109.0.0/16:24
default_interface_model:
- &interface_model !os_env INTERFACE_MODEL, e1000
rack-01-slave-interfaces: &rack-01-slave-interfaces
- label: eth0
l2_network_device: admin # Libvirt bridge name. It is *NOT* Nailgun networks
interface_model: *interface_model
- label: eth1
l2_network_device: public
interface_model: *interface_model
- label: eth2
l2_network_device: storage
interface_model: *interface_model
- label: eth3
l2_network_device: management
interface_model: *interface_model
- label: eth4
l2_network_device: private
interface_model: *interface_model
rack-01-slave-network_config: &rack-01-slave-network_config
eth0:
@ -145,6 +153,7 @@ groups:
interfaces:
- label: eth0
l2_network_device: admin # Libvirt bridge name. It is *NOT* a Nailgun network
interface_model: *interface_model
network_config:
eth0:
networks:

21
system_test/tests_templates/devops_configs/multirack.yaml
View File

@ -4,41 +4,59 @@ aliases:
dynamic_address_pool:
- &pool_default !os_env POOL_DEFAULT, 10.109.0.0/16:24
default_interface_model:
- &interface_model !os_env INTERFACE_MODEL, e1000
default-slave-interfaces: &default-slave-interfaces
- label: enp0s3
l2_network_device: admin # Libvirt bridge name. It is *NOT* Nailgun networks
interface_model: *interface_model
- label: enp0s4
l2_network_device: public
interface_model: *interface_model
- label: enp0s5
l2_network_device: management
interface_model: *interface_model
- label: enp0s6
l2_network_device: private
interface_model: *interface_model
- label: enp0s7
l2_network_device: storage
interface_model: *interface_model
rack-02-slave-interfaces: &rack-02-slave-interfaces
- label: enp0s3
l2_network_device: admin2 # Libvirt bridge name. It is *NOT* Nailgun networks
interface_model: *interface_model
- label: enp0s4
l2_network_device: public2
interface_model: *interface_model
- label: enp0s5
l2_network_device: management2
interface_model: *interface_model
- label: enp0s6
l2_network_device: private2
interface_model: *interface_model
- label: enp0s7
l2_network_device: storage
interface_model: *interface_model
rack-03-slave-interfaces: &rack-03-slave-interfaces
- label: enp0s3
l2_network_device: admin3 # Libvirt bridge name. It is *NOT* Nailgun networks
interface_model: *interface_model
- label: enp0s4
l2_network_device: public3
interface_model: *interface_model
- label: enp0s5
l2_network_device: management3
interface_model: *interface_model
- label: enp0s6
l2_network_device: private3
interface_model: *interface_model
- label: enp0s7
l2_network_device: storage
interface_model: *interface_model
default-slave-network_config: &default-slave-network_config
enp0s3:
@ -280,10 +298,13 @@ groups:
interfaces:
- label: enp0s3
l2_network_device: admin # Libvirt bridge name. It is *NOT* a Nailgun network
interface_model: *interface_model
- label: enp0s4
l2_network_device: admin2
interface_model: *interface_model
- label: enp0s5
l2_network_device: admin3
interface_model: *interface_model
network_config:
enp0s3:
networks: