openstack/rally
Code Issues Proposed changes

Merge "[Sahara] Remove volumes from non-workers"

Browse Source
This commit is contained in:
Jenkins
2015-12-08 16:10:26 +00:00
committed by Gerrit Code Review
parent c516cfb874 03fc1b9c52
commit 70c585dcbd
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
rally/plugins/openstack/scenarios/sahara/utils.py
View File

@@ -198,8 +198,13 @@ class SaharaScenario(scenario.OpenStackScenario):
if volumes_per_node:
LOG.debug("Adding volumes config to Node Groups")
for ng in node_groups:
ng["volumes_per_node"] = volumes_per_node
ng["volumes_size"] = volumes_size
ng_name = ng["name"]
if "worker" in ng_name or "proxy" in ng_name:
# NOTE: Volume storage is used only by HDFS Datanode
# process which runs on workers and proxies.
ng["volumes_per_node"] = volumes_per_node
ng["volumes_size"] = volumes_size
return node_groups

4
tests/unit/plugins/openstack/scenarios/sahara/test_utils.py
View File

@@ -169,8 +169,6 @@ class SaharaScenarioTestCase(test.ScenarioTestCase):
"flavor_id": "test_flavor",
"node_processes": ["p1"],
"floating_ip_pool": floating_ip_pool_uuid,
"volumes_per_node": 5,
"volumes_size": 10,
"count": 1,
"auto_security_group": True,
"security_groups": ["g1", "g2"],
@@ -274,8 +272,6 @@ class SaharaScenarioTestCase(test.ScenarioTestCase):
"flavor_id": "test_flavor",
"node_processes": ["p1"],
"floating_ip_pool": floating_ip_pool_uuid,
"volumes_per_node": 5,
"volumes_size": 10,
"count": 1,
"auto_security_group": True,
"security_groups": ["g1", "g2"],