diff --git a/gates_tests/devops_templates/ironic_template.yaml b/gates_tests/devops_templates/ironic_template.yaml index 708ae7cc0..8fafcea21 100644 --- a/gates_tests/devops_templates/ironic_template.yaml +++ b/gates_tests/devops_templates/ironic_template.yaml @@ -1,366 +1,208 @@ --- +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 + + slave-interfaces: &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 + - label: eth5 + l2_network_device: ironic + interface_model: *interface_model + + slave-network_config: &slave-network_config + eth0: + networks: + - fuelweb_admin + eth1: + networks: + - public + eth2: + networks: + - storage + eth3: + networks: + - management + eth4: + networks: + - private + eth5: + networks: + - baremetal + + slave-node-params: &slave-node-params + vcpu: !os_env SLAVE_NODE_CPU, 2 + memory: !os_env SLAVE_NODE_MEMORY, 3072 + boot: + - network + - hd + volumes: + - name: system + capacity: !os_env NODE_VOLUME_SIZE, 55 + format: qcow2 + - name: cinder + capacity: !os_env NODE_VOLUME_SIZE, 55 + format: qcow2 + - name: swift + capacity: !os_env NODE_VOLUME_SIZE, 55 + format: qcow2 + interfaces: *slave-interfaces + network_config: *slave-network_config + template: devops_settings: - address_pools: - admin: - net: !os_env POOL_DEFAULT, 10.109.0.0/16:24 - ironic: - net: !os_env POOL_DEFAULT, 10.109.0.0/16:24 - management: - net: !os_env POOL_DEFAULT, 10.109.0.0/16:24 - private: - net: !os_env POOL_DEFAULT, 10.109.0.0/16:24 - public: - net: !os_env POOL_DEFAULT, 10.109.0.0/16:24 - storage: - net: !os_env POOL_DEFAULT, 10.109.0.0/16:24 env_name: !os_env ENV_NAME + address_pools: + # Network pools used by the environment + fuelweb_admin: + net: *pool_default + public: + net: *pool_default + storage: + net: *pool_default + management: + net: *pool_default + ironic: + net: *pool_default + private: + net: *pool_default + groups: - - l2_network_devices: - admin: - address_pool: admin - dhcp: false - forward: - mode: nat - ironic: - address_pool: ironic - dhcp: false - forward: - mode: null - management: - address_pool: management - dhcp: false - forward: - mode: null - private: - address_pool: private - dhcp: false - forward: - mode: null - public: - address_pool: public - dhcp: false - forward: - mode: nat - storage: - address_pool: storage - dhcp: false - forward: - mode: null - name: rack-01 - nodes: - - name: admin - params: - boot: - - hd - - cdrom - interfaces: - - l2_network_device: admin - label: eth0 - memory: 3072 - vcpu: 2 - volumes: - - capacity: !os_env ADMIN_NODE_VOLUME_SIZE, 75 - format: qcow2 - name: system - - bus: ide - device: cdrom - format: raw - name: iso - source_image: !os_env ISO_PATH - role: fuel_master - - name: slave-01 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: fuel_slave - - name: slave-02 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: fuel_slave - - name: slave-03 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: fuel_slave - - name: slave-04 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: fuel_slave - - name: slave-05 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: fuel_slave - - name: slave-06 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: fuel_slave - - name: slave-07 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: fuel_slave - - name: slave-08 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: fuel_slave - - name: slave-09 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: admin - label: eth0 - - l2_network_device: public - label: eth1 - - l2_network_device: management - label: eth2 - - l2_network_device: private - label: eth3 - - l2_network_device: storage - label: eth4 - - l2_network_device: ironic - label: eth5 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: cinder - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - - name: swift - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - name: swift - role: fuel_slave - - name: ironic-slave-01 - params: - boot: - - network - - hd - interfaces: - - l2_network_device: ironic - label: eth0 - memory: 4096 - vcpu: 2 - volumes: - - name: system - capacity: !os_env NODE_VOLUME_SIZE, 50 - format: qcow2 - role: ironic_slave + - name: default + driver: + name: devops.driver.libvirt.libvirt_driver + 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) + + fuelweb_admin: fuelweb_admin + public: public + storage: storage + management: management + private: private + ironic: ironic + + l2_network_devices: # Libvirt bridges. It is *NOT* Nailgun networks + admin: + address_pool: fuelweb_admin + dhcp: false + forward: + mode: nat + + public: + address_pool: public + dhcp: false + forward: + mode: nat + + storage: + address_pool: storage + dhcp: false + + management: + address_pool: management + dhcp: false + + private: + address_pool: private + dhcp: false + + ironic: + address_pool: ironic + dhcp: false + + nodes: + - name: admin # Custom name of VM for Fuel admin node + role: fuel_master # Fixed role for Fuel master node properties + params: + vcpu: !os_env ADMIN_NODE_CPU, 2 + memory: !os_env ADMIN_NODE_MEMORY, 3072 + boot: + - hd + - cdrom # for boot from usb - without 'cdrom' + volumes: + - name: system + capacity: !os_env ADMIN_NODE_VOLUME_SIZE, 80 + format: qcow2 + - name: iso + source_image: !os_env ISO_PATH # if 'source_image' set, then volume capacity is calculated from it's size + format: raw + device: cdrom # for boot from usb - 'disk' + bus: ide # for boot from usb - 'usb' + interfaces: + - label: eth0 + l2_network_device: admin # Libvirt bridge name. It is *NOT* a Nailgun network + interface_model: *interface_model + network_config: + eth0: + networks: + - fuelweb_admin + + - name: slave-01 + role: fuel_slave + params: *slave-node-params + - name: slave-02 + role: fuel_slave + params: *slave-node-params + - name: slave-03 + role: fuel_slave + params: *slave-node-params + - name: slave-04 + role: fuel_slave + params: *slave-node-params + - name: slave-05 + role: fuel_slave + params: *slave-node-params + - name: slave-06 + role: fuel_slave + params: *slave-node-params + # slaves 7-9 is not used by fuel-qa but can be used in manual tests + - name: slave-07 + role: fuel_slave + params: *slave-node-params + - name: slave-08 + role: fuel_slave + params: *slave-node-params + - name: slave-09 + role: fuel_slave + params: *slave-node-params + - name: ironic-slave-01 + role: ironic + params: &ironic-slave-node-params + vcpu: !os_env SLAVE_NODE_CPU, 2 + memory: !os_env SLAVE_NODE_MEMORY, 3072 + boot: + - network + - hd + volumes: + - name: system + capacity: !os_env NODE_VOLUME_SIZE, 50 + format: qcow2 + interfaces: + - l2_network_device: ironic + label: eth0 + interface_model: *interface_model diff --git a/system_test/tests_templates/devops_configs/ironic.yaml b/system_test/tests_templates/devops_configs/ironic.yaml index 652d0f7e7..125a30026 100644 --- a/system_test/tests_templates/devops_configs/ironic.yaml +++ b/system_test/tests_templates/devops_configs/ironic.yaml @@ -7,7 +7,7 @@ aliases: default_interface_model: - &interface_model !os_env INTERFACE_MODEL, e1000 - rack-01-slave-interfaces: &rack-01-slave-interfaces + slave-interfaces: &slave-interfaces - label: eth0 l2_network_device: admin # Libvirt bridge name. It is *NOT* Nailgun networks interface_model: *interface_model @@ -27,7 +27,7 @@ aliases: l2_network_device: ironic interface_model: *interface_model - rack-01-slave-network_config: &rack-01-slave-network_config + slave-network_config: &slave-network_config eth0: networks: - fuelweb_admin @@ -47,7 +47,7 @@ aliases: networks: - baremetal - rack-01-slave-node-params: &rack-01-slave-node-params + slave-node-params: &slave-node-params vcpu: !os_env SLAVE_NODE_CPU, 2 memory: !os_env SLAVE_NODE_MEMORY, 3072 boot: @@ -63,8 +63,8 @@ aliases: - name: swift capacity: !os_env NODE_VOLUME_SIZE, 55 format: qcow2 - interfaces: *rack-01-slave-interfaces - network_config: *rack-01-slave-network_config + interfaces: *slave-interfaces + network_config: *slave-network_config template: devops_settings: @@ -177,46 +177,48 @@ template: - name: slave-01 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params - name: slave-02 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params - name: slave-03 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params - name: slave-04 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params - name: slave-05 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params - name: slave-06 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params # slaves 7-9 is not used by fuel-qa but can be used in manual tests - name: slave-07 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params - name: slave-08 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params - name: slave-09 role: fuel_slave - params: *rack-01-slave-node-params + params: *slave-node-params - name: ironic-slave-01 - params: &rack-01-ironic-slave-node-params + role: ironic + params: &ironic-slave-node-params + vcpu: !os_env SLAVE_NODE_CPU, 2 + memory: !os_env SLAVE_NODE_MEMORY, 3072 boot: - network - hd - interfaces: - - l2_network_device: ironic - label: eth0 - memory: 4096 - vcpu: 2 volumes: - name: system capacity: !os_env NODE_VOLUME_SIZE, 50 format: qcow2 - role: ironic_slave + interfaces: + - l2_network_device: ironic + label: eth0 + interface_model: *interface_model - name: ironic-slave-02 - params: *rack-01-ironic-slave-node-params + params: *ironic-slave-node-params + role: ironic