Reduce amount of slaves in devops template

Change-Id: I80b7caad030ca844fb3f2514849f12fac02fec6c
This commit is contained in:
ibumarskov 2016-10-12 15:06:53 +03:00 committed by Ilya Bumarskov
parent 1a39ecce98
commit 68a8022e36
2 changed files with 5 additions and 29 deletions

View File

@ -44,20 +44,14 @@ template:
- storage
rack-01-slave-node-params: &rack-01-slave-node-params
vcpu: !os_env SLAVE_NODE_CPU, 4
vcpu: !os_env SLAVE_NODE_CPU, 2
memory: !os_env SLAVE_NODE_MEMORY, 8192
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
capacity: !os_env NODE_VOLUME_SIZE, 150
format: qcow2
interfaces: *rack-01-slave-interfaces
network_config: *rack-01-slave-network_config
@ -70,13 +64,7 @@ template:
- 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
capacity: !os_env NODE_VOLUME_SIZE, 150
format: qcow2
interfaces: *rack-01-slave-interfaces
network_config: *rack-01-slave-network_config
@ -195,15 +183,3 @@ template:
- name: slave-05
role: fuel_slave
params: *rack-02-slave-node-params
- name: slave-06
role: fuel_slave
params: *rack-02-slave-node-params
- name: slave-07
role: fuel_slave
params: *rack-02-slave-node-params
- name: slave-08
role: fuel_slave
params: *rack-02-slave-node-params
- name: slave-09
role: fuel_slave
params: *rack-02-slave-node-params

View File

@ -145,7 +145,7 @@ class TestNSXtSmoke(TestNSXtBase):
class TestNSXtBVT(TestNSXtBase):
"""NSX-t BVT scenarios"""
@test(depends_on=[SetupEnvironment.prepare_slaves_9],
@test(depends_on=[SetupEnvironment.prepare_slaves_5],
groups=["nsxt_bvt"])
@log_snapshot_after_test
def nsxt_bvt(self):
@ -168,7 +168,7 @@ class TestNSXtBVT(TestNSXtBase):
Duration 3 hours
"""
self.env.revert_snapshot("ready_with_9_slaves")
self.env.revert_snapshot("ready_with_5_slaves")
self.show_step(1)
self.install_nsxt_plugin()