Add interface_model to devops templates.
interface_model is a required field. It must be specified in devops template file. Change-Id: I11ced94b21b949ef34b4cba2d0aecd2a6c76d36b
This commit is contained in:
parent
b340f64e94
commit
efbe9dcd15
@ -4,17 +4,25 @@ aliases:
|
|||||||
dynamic_address_pool:
|
dynamic_address_pool:
|
||||||
- &pool_default !os_env POOL_DEFAULT, 10.109.0.0/16:24
|
- &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
|
rack-01-slave-interfaces: &rack-01-slave-interfaces
|
||||||
- label: eth0
|
- label: eth0
|
||||||
l2_network_device: admin # Libvirt bridge name. It is *NOT* Nailgun networks
|
l2_network_device: admin # Libvirt bridge name. It is *NOT* Nailgun networks
|
||||||
|
interface_model: *interface_model
|
||||||
- label: eth1
|
- label: eth1
|
||||||
l2_network_device: public
|
l2_network_device: public
|
||||||
|
interface_model: *interface_model
|
||||||
- label: eth2
|
- label: eth2
|
||||||
l2_network_device: storage
|
l2_network_device: storage
|
||||||
|
interface_model: *interface_model
|
||||||
- label: eth3
|
- label: eth3
|
||||||
l2_network_device: management
|
l2_network_device: management
|
||||||
|
interface_model: *interface_model
|
||||||
- label: eth4
|
- label: eth4
|
||||||
l2_network_device: private
|
l2_network_device: private
|
||||||
|
interface_model: *interface_model
|
||||||
|
|
||||||
rack-01-slave-network_config: &rack-01-slave-network_config
|
rack-01-slave-network_config: &rack-01-slave-network_config
|
||||||
eth0:
|
eth0:
|
||||||
@ -145,6 +153,7 @@ groups:
|
|||||||
interfaces:
|
interfaces:
|
||||||
- label: eth0
|
- label: eth0
|
||||||
l2_network_device: admin # Libvirt bridge name. It is *NOT* a Nailgun network
|
l2_network_device: admin # Libvirt bridge name. It is *NOT* a Nailgun network
|
||||||
|
interface_model: *interface_model
|
||||||
network_config:
|
network_config:
|
||||||
eth0:
|
eth0:
|
||||||
networks:
|
networks:
|
||||||
|
@ -4,41 +4,59 @@ aliases:
|
|||||||
dynamic_address_pool:
|
dynamic_address_pool:
|
||||||
- &pool_default !os_env POOL_DEFAULT, 10.109.0.0/16:24
|
- &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
|
default-slave-interfaces: &default-slave-interfaces
|
||||||
- label: enp0s3
|
- label: enp0s3
|
||||||
l2_network_device: admin # Libvirt bridge name. It is *NOT* Nailgun networks
|
l2_network_device: admin # Libvirt bridge name. It is *NOT* Nailgun networks
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s4
|
- label: enp0s4
|
||||||
l2_network_device: public
|
l2_network_device: public
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s5
|
- label: enp0s5
|
||||||
l2_network_device: management
|
l2_network_device: management
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s6
|
- label: enp0s6
|
||||||
l2_network_device: private
|
l2_network_device: private
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s7
|
- label: enp0s7
|
||||||
l2_network_device: storage
|
l2_network_device: storage
|
||||||
|
interface_model: *interface_model
|
||||||
|
|
||||||
rack-02-slave-interfaces: &rack-02-slave-interfaces
|
rack-02-slave-interfaces: &rack-02-slave-interfaces
|
||||||
- label: enp0s3
|
- label: enp0s3
|
||||||
l2_network_device: admin2 # Libvirt bridge name. It is *NOT* Nailgun networks
|
l2_network_device: admin2 # Libvirt bridge name. It is *NOT* Nailgun networks
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s4
|
- label: enp0s4
|
||||||
l2_network_device: public2
|
l2_network_device: public2
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s5
|
- label: enp0s5
|
||||||
l2_network_device: management2
|
l2_network_device: management2
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s6
|
- label: enp0s6
|
||||||
l2_network_device: private2
|
l2_network_device: private2
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s7
|
- label: enp0s7
|
||||||
l2_network_device: storage
|
l2_network_device: storage
|
||||||
|
interface_model: *interface_model
|
||||||
|
|
||||||
rack-03-slave-interfaces: &rack-03-slave-interfaces
|
rack-03-slave-interfaces: &rack-03-slave-interfaces
|
||||||
- label: enp0s3
|
- label: enp0s3
|
||||||
l2_network_device: admin3 # Libvirt bridge name. It is *NOT* Nailgun networks
|
l2_network_device: admin3 # Libvirt bridge name. It is *NOT* Nailgun networks
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s4
|
- label: enp0s4
|
||||||
l2_network_device: public3
|
l2_network_device: public3
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s5
|
- label: enp0s5
|
||||||
l2_network_device: management3
|
l2_network_device: management3
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s6
|
- label: enp0s6
|
||||||
l2_network_device: private3
|
l2_network_device: private3
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s7
|
- label: enp0s7
|
||||||
l2_network_device: storage
|
l2_network_device: storage
|
||||||
|
interface_model: *interface_model
|
||||||
|
|
||||||
default-slave-network_config: &default-slave-network_config
|
default-slave-network_config: &default-slave-network_config
|
||||||
enp0s3:
|
enp0s3:
|
||||||
@ -280,10 +298,13 @@ groups:
|
|||||||
interfaces:
|
interfaces:
|
||||||
- label: enp0s3
|
- label: enp0s3
|
||||||
l2_network_device: admin # Libvirt bridge name. It is *NOT* a Nailgun network
|
l2_network_device: admin # Libvirt bridge name. It is *NOT* a Nailgun network
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s4
|
- label: enp0s4
|
||||||
l2_network_device: admin2
|
l2_network_device: admin2
|
||||||
|
interface_model: *interface_model
|
||||||
- label: enp0s5
|
- label: enp0s5
|
||||||
l2_network_device: admin3
|
l2_network_device: admin3
|
||||||
|
interface_model: *interface_model
|
||||||
network_config:
|
network_config:
|
||||||
enp0s3:
|
enp0s3:
|
||||||
networks:
|
networks:
|
||||||
|
Loading…
Reference in New Issue
Block a user