aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRex Lee <limingjiang@huawei.com>2018-08-14 01:44:00 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-08-14 01:44:00 +0000
commit799a7d36587b14cbc0a9e24da5ba627b7ccb935c (patch)
tree68bfe59016a5cbcda798c5012f8c7421996f1754
parent04eb2e6ed5fa8710e853cf5d090498bf76cfdc18 (diff)
parentc64d9932ed2fdc4823691adf529d00390f1de53c (diff)
Merge "Bugfix: pylint fix for yardstick/orchestrator/heat.py (no-value-for-parameter)"
-rw-r--r--yardstick/orchestrator/heat.py10
1 files changed, 3 insertions, 7 deletions
diff --git a/yardstick/orchestrator/heat.py b/yardstick/orchestrator/heat.py
index e0c0db262..99a5760a3 100644
--- a/yardstick/orchestrator/heat.py
+++ b/yardstick/orchestrator/heat.py
@@ -227,14 +227,10 @@ name (i.e. %s).
def add_volume_attachment(self, server_name, volume_name, mountpoint=None):
"""add to the template an association of volume to instance"""
- log.debug("adding Cinder::VolumeAttachment server '%s' volume '%s' ", server_name,
- volume_name)
-
+ log.debug("adding Cinder::VolumeAttachment server '%s' volume '%s' ",
+ server_name, volume_name)
name = "%s-%s" % (server_name, volume_name)
-
- volume_id = op_utils.get_volume_id(volume_name)
- if not volume_id:
- volume_id = {'get_resource': volume_name}
+ volume_id = {'get_resource': volume_name}
self.resources[name] = {
'type': 'OS::Cinder::VolumeAttachment',
'properties': {'instance_uuid': {'get_resource': server_name},