Template for nsxt is changed
- amount of cpu for controller nodes is increased to 4 - DRIVER_STP environment variable is added, true - DRIVER_HPET environment variable is added, false - DRIVER_USE_HOST_CPU environment variable is added, false - a template for fuel-devops3 is added - not controller slaves ram is increased to 4096 Change-Id: I0e2dbca1f4d247e2559c38707012c097dcc7d380
This commit is contained in:
parent
76b7a75d36
commit
8b63f5495f
|
@ -44,7 +44,7 @@ template:
|
|||
- storage
|
||||
|
||||
rack-01-slave-node-params: &rack-01-slave-node-params
|
||||
vcpu: !os_env SLAVE_NODE_CPU, 2
|
||||
vcpu: !os_env SLAVE_NODE_CPU, 4
|
||||
memory: !os_env SLAVE_NODE_MEMORY, 8192
|
||||
boot:
|
||||
- network
|
||||
|
@ -57,8 +57,8 @@ template:
|
|||
network_config: *rack-01-slave-network_config
|
||||
|
||||
rack-02-slave-node-params: &rack-02-slave-node-params
|
||||
vcpu: !os_env SLAVE_NODE_CPU, 2
|
||||
memory: !os_env SLAVE_NODE_MEMORY, 3072
|
||||
vcpu: !os_env SLAVE_NODE_CPU, 4
|
||||
memory: !os_env SLAVE_NODE_MEMORY, 4096
|
||||
boot:
|
||||
- network
|
||||
- hd
|
||||
|
@ -102,14 +102,11 @@ template:
|
|||
params:
|
||||
connection_string: !os_env CONNECTION_STRING, qemu:///system
|
||||
storage_pool_name: !os_env STORAGE_POOL_NAME, default
|
||||
stp: True
|
||||
hpet: False
|
||||
use_host_cpu: !os_env DRIVER_USE_HOST_CPU, true
|
||||
|
||||
network_pools: # Address pools for OpenStack networks.
|
||||
# Actual names should be used for keys
|
||||
# (the same as in Nailgun, for example)
|
||||
stp: !os_env DRIVER_STP, True
|
||||
hpet: !os_env DRIVER_HPET, False
|
||||
use_host_cpu: !os_env DRIVER_USE_HOST_CPU, True
|
||||
|
||||
network_pools:
|
||||
fuelweb_admin: fuelweb_admin-pool01
|
||||
public: public-pool01
|
||||
storage: storage-pool01
|
||||
|
|
|
@ -0,0 +1,197 @@
|
|||
---
|
||||
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
|
||||
|
||||
interfaces-configuration: &interfaces-configuration
|
||||
- label: eth0
|
||||
l2_network_device: admin
|
||||
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
|
||||
|
||||
network_config: &network-configuration
|
||||
eth0:
|
||||
networks:
|
||||
- admin
|
||||
eth1:
|
||||
networks:
|
||||
- public
|
||||
eth2:
|
||||
networks:
|
||||
- storage
|
||||
eth3:
|
||||
networks:
|
||||
- management
|
||||
eth4:
|
||||
networks:
|
||||
- private
|
||||
|
||||
controller-node-params: &controller-node-params
|
||||
vcpu: !os_env CONTROLLER_NODE_CPU, 4
|
||||
memory: !os_env CONTROLLER_NODE_MEMORY, 8192
|
||||
boot:
|
||||
- network
|
||||
- hd
|
||||
volumes:
|
||||
- name: system
|
||||
format: qcow2
|
||||
capacity: !os_env NODE_VOLUME_SIZE, 150
|
||||
interfaces: *interfaces-configuration
|
||||
network_config: *network-configuration
|
||||
|
||||
slave-node-params: &slave-node-params
|
||||
vcpu: !os_env SLAVE_NODE_CPU, 2
|
||||
memory: !os_env SLAVE_NODE_MEMORY, 4096
|
||||
boot:
|
||||
- network
|
||||
- hd
|
||||
volumes:
|
||||
- name: system
|
||||
format: qcow2
|
||||
capacity: !os_env NODE_VOLUME_SIZE, 150
|
||||
interfaces: *interfaces-configuration
|
||||
network_config: *network-configuration
|
||||
|
||||
template:
|
||||
devops_settings:
|
||||
env_name: !os_env ENV_NAME
|
||||
|
||||
address_pools:
|
||||
admin-pool:
|
||||
net: *pool_default
|
||||
params:
|
||||
vlan_start: 0
|
||||
ip_reserved:
|
||||
gateway: +1
|
||||
l2_network_device: +1
|
||||
ip_ranges:
|
||||
default: [+2, -2]
|
||||
|
||||
public-pool:
|
||||
net: *pool_default
|
||||
params:
|
||||
vlan_start: 0
|
||||
ip_reserved:
|
||||
gateway: +1
|
||||
l2_network_device: +1
|
||||
ip_ranges:
|
||||
default: [+2, +127]
|
||||
floating: [+128, -2]
|
||||
|
||||
storage-pool:
|
||||
net: *pool_default
|
||||
params:
|
||||
vlan_start: 101
|
||||
|
||||
management-pool:
|
||||
net: *pool_default
|
||||
params:
|
||||
vlan_start: 102
|
||||
|
||||
private-pool:
|
||||
net: *pool_default
|
||||
params:
|
||||
vlan_start: 1000
|
||||
vlan_end: 1030
|
||||
|
||||
groups:
|
||||
- name: nsxt
|
||||
driver:
|
||||
name: devops.driver.libvirt
|
||||
params:
|
||||
connection_string: !os_env CONNECTION_STRING, qemu:///system
|
||||
storage_pool_name: !os_env STORAGE_POOL_NAME, default
|
||||
use_host_cpu: !os_env DRIVER_USE_HOST_CPU, True
|
||||
enable_acpi: !os_env DRIVER_ENABLE_ACPI, True
|
||||
enable_nwfilters: !os_env DRIVER_ENABLE_NWFILTERS, False
|
||||
stp: True
|
||||
hpet: True
|
||||
|
||||
network_pools:
|
||||
admin: admin-pool
|
||||
public: public-pool
|
||||
storage: storage-pool
|
||||
management: management-pool
|
||||
private: private-pool
|
||||
|
||||
l2_network_devices:
|
||||
admin:
|
||||
address_pool: admin-pool
|
||||
dhcp: false
|
||||
# forward:
|
||||
# mode: nat
|
||||
|
||||
public:
|
||||
address_pool: public-pool
|
||||
dhcp: false
|
||||
# forward:
|
||||
# mode: nat
|
||||
|
||||
storage:
|
||||
address_pool: storage-pool
|
||||
dhcp: false
|
||||
|
||||
management:
|
||||
address_pool: management-pool
|
||||
dhcp: false
|
||||
|
||||
private:
|
||||
address_pool: private-pool
|
||||
dhcp: false
|
||||
|
||||
nodes:
|
||||
- name: admin
|
||||
role: fuel_master
|
||||
params:
|
||||
vcpu: !os_env ADMIN_NODE_CPU, 2
|
||||
memory: !os_env ADMIN_NODE_MEMORY, 8192
|
||||
boot:
|
||||
- hd
|
||||
- cdrom
|
||||
volumes:
|
||||
- name: system
|
||||
capacity: !os_env ADMIN_NODE_VOLUME_SIZE, 80
|
||||
format: qcow2
|
||||
- name: iso
|
||||
source_image: !os_env ISO_PATH
|
||||
format: raw
|
||||
device: cdrom
|
||||
bus: ide
|
||||
interfaces:
|
||||
- label: eth0
|
||||
l2_network_device: admin
|
||||
interface_model: *interface_model
|
||||
network_config:
|
||||
eth0:
|
||||
networks:
|
||||
- admin
|
||||
|
||||
- name: slave-01
|
||||
role: fuel_slave
|
||||
params: *controller-node-params
|
||||
- name: slave-02
|
||||
role: fuel_slave
|
||||
params: *controller-node-params
|
||||
- name: slave-03
|
||||
role: fuel_slave
|
||||
params: *controller-node-params
|
||||
- name: slave-04
|
||||
role: fuel_slave
|
||||
params: *slave-node-params
|
||||
- name: slave-05
|
||||
role: fuel_slave
|
||||
params: *slave-node-params
|
Loading…
Reference in New Issue