Code Review
/
parser.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Support python3 uploaded to pypi websit
[parser.git]
/
tosca2heat
/
heat-translator
/
translator
/
hot
/
tosca
/
tosca_block_storage_attachment.py
diff --git
a/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py
b/tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py
index
715d5b3
..
f471b83
100644
(file)
--- a/
tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py
+++ b/
tosca2heat/heat-translator/translator/hot/tosca/tosca_block_storage_attachment.py
@@
-23,9
+23,11
@@
class ToscaBlockStorageAttachment(HotResource):
toscatype = 'tosca.nodes.BlockStorageAttachment'
toscatype = 'tosca.nodes.BlockStorageAttachment'
- def __init__(self, template, nodetemplates, instance_uuid, volume_id):
+ def __init__(self, template, nodetemplates, instance_uuid, volume_id,
+ csar_dir=None):
super(ToscaBlockStorageAttachment,
super(ToscaBlockStorageAttachment,
- self).__init__(template, type='OS::Cinder::VolumeAttachment')
+ self).__init__(template, type='OS::Cinder::VolumeAttachment',
+ csar_dir=csar_dir)
self.nodetemplates = nodetemplates
self.instance_uuid = {'get_resource': instance_uuid}
self.volume_id = {'get_resource': volume_id}
self.nodetemplates = nodetemplates
self.instance_uuid = {'get_resource': instance_uuid}
self.volume_id = {'get_resource': volume_id}
@@
-44,5
+46,10
@@
class ToscaBlockStorageAttachment(HotResource):
if 'location' in self.properties:
self.properties['mountpoint'] = self.properties.pop('location')
if 'location' in self.properties:
self.properties['mountpoint'] = self.properties.pop('location')
+ # TOSCA type can have a device name specified,
+ # this is unsupported by Heat
+ if 'device' in self.properties:
+ self.properties.pop('device')
+
def handle_life_cycle(self):
def handle_life_cycle(self):
- pass
+ return None, None, None