openstack/deb-sahara
Code Issues Proposed changes

Merge "Fix usage volume type in Heat"

Browse Source
This commit is contained in:
Jenkins 2015-05-15 16:03:44 +00:00 committed by Gerrit Code Review
commit c45b83e0a7
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sahara/service/heat/templates.py
View File

@ -280,9 +280,11 @@ class ClusterTemplate(object):
volume_attach_name = _get_volume_attach_name(inst_name, volume_idx)
properties = {
"name": volume_name,
"size": six.text_type(volumes_size),
"volume_type": volume_type
"size": six.text_type(volumes_size)
}
if volume_type:
properties["volume_type"] = volume_type
if volumes_availability_zone:
properties["availability_zone"] = volumes_availability_zone

4
sahara/tests/unit/resources/test_serialize_resources_use_nn_with_autoassignment.heat
View File

@ -15,10 +15,10 @@ resources:
line3'}
type: OS::Nova::Server
cluster-worker-001-volume-0:
properties: {name: cluster-worker-001-volume-0, size: '10', volume_type: null}
properties: {name: cluster-worker-001-volume-0, size: '10'}
type: OS::Cinder::Volume
cluster-worker-001-volume-1:
properties: {name: cluster-worker-001-volume-1, size: '10', volume_type: null}
properties: {name: cluster-worker-001-volume-1, size: '10'}
type: OS::Cinder::Volume
cluster-worker-001-volume-attachment-0:
properties:

4
sahara/tests/unit/resources/test_serialize_resources_use_nn_without_autoassignment.heat
View File

@ -31,10 +31,10 @@ resources:
server_id: {Ref: cluster-worker-001}
type: OS::Nova::FloatingIPAssociation
cluster-worker-001-volume-0:
properties: {name: cluster-worker-001-volume-0, size: '10', volume_type: null}
properties: {name: cluster-worker-001-volume-0, size: '10'}
type: OS::Cinder::Volume
cluster-worker-001-volume-1:
properties: {name: cluster-worker-001-volume-1, size: '10', volume_type: null}
properties: {name: cluster-worker-001-volume-1, size: '10'}
type: OS::Cinder::Volume
cluster-worker-001-volume-attachment-0:
properties:

2
sahara/tests/unit/resources/test_serialize_resources_volume_local_to_instance.heat
View File

@ -24,7 +24,7 @@ resources:
properties: {network_id: private_net, replacement_policy: AUTO}
type: OS::Neutron::Port
cluster-master-001-volume-0:
properties: {name: cluster-master-001-volume-0, size: '10', volume_type: null}
properties: {name: cluster-master-001-volume-0, size: '10'}
type: OS::Cinder::Volume
cluster-master-001-volume-attachment-0:
properties: