Merge "Fix env configuration to avoid controller-ceph mix Related-Bug: #1589956"

This commit is contained in:
Jenkins 2016-07-01 09:09:19 +00:00 committed by Gerrit Code Review
commit 9acf80b921
1 changed files with 8 additions and 7 deletions

View File

@ -37,8 +37,8 @@ class GateOstf(TestBasic):
Scenario: Scenario:
1. Create cluster 1. Create cluster
2. Add 3 nodes with controller and ceph OSD roles 2. Add 3 nodes with controller roles
3. Add 2 nodes with compute 3. Add 3 nodes with compute and ceph OSD
4. Deploy the cluster 4. Deploy the cluster
5. Run OSTF 5. Run OSTF
@ -73,11 +73,12 @@ class GateOstf(TestBasic):
self.fuel_web.update_nodes( self.fuel_web.update_nodes(
cluster_id, cluster_id,
{ {
'slave-01': ['controller', 'ceph-osd'], 'slave-01': ['controller'],
'slave-02': ['controller', 'ceph-osd'], 'slave-02': ['controller'],
'slave-03': ['controller', 'ceph-osd'], 'slave-03': ['controller'],
'slave-04': ['compute'], 'slave-04': ['compute', 'ceph-osd'],
'slave-05': ['compute'], 'slave-05': ['compute', 'ceph-osd'],
'slave-06': ['compute', 'ceph-osd'],
} }
) )
self.fuel_web.deploy_cluster_wait(cluster_id) self.fuel_web.deploy_cluster_wait(cluster_id)