openstack/tempest
Code Issues Proposed changes

Merge "Making delete_on_termination configurable"

Browse Source
This commit is contained in:
Jenkins 2016-07-06 14:18:35 +00:00 committed by Gerrit Code Review
commit 617e65ac03
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
tempest/common/compute.py
View File

@ -30,7 +30,8 @@ LOG = logging.getLogger(__name__)
def create_test_server(clients, validatable=False, validation_resources=None, def create_test_server(clients, validatable=False, validation_resources=None,
tenant_network=None, wait_until=None, tenant_network=None, wait_until=None,
volume_backed=False, name=None, flavor=None, volume_backed=False, name=None, flavor=None,
image_id=None, **kwargs): image_id=None, delete_vol_on_termination=True,
**kwargs):
"""Common wrapper utility returning a test server. """Common wrapper utility returning a test server.
This method is a common wrapper returning a test server that can be This method is a common wrapper returning a test server that can be
@ -106,7 +107,7 @@ def create_test_server(clients, validatable=False, validation_resources=None,
'source_type': 'volume', 'source_type': 'volume',
'destination_type': 'volume', 'destination_type': 'volume',
'boot_index': 0, 'boot_index': 0,
'delete_on_termination': True}] 'delete_on_termination': delete_vol_on_termination}]
kwargs['block_device_mapping_v2'] = bd_map_v2 kwargs['block_device_mapping_v2'] = bd_map_v2
# Since this is boot from volume an image does not need # Since this is boot from volume an image does not need