nova.py (horizon-18.6.2) | : | nova.py (horizon-18.6.3) | ||
---|---|---|---|---|
skipping to change at line 486 | skipping to change at line 486 | |||
def keypair_get(request, name): | def keypair_get(request, name): | |||
return _nova.novaclient(request).keypairs.get(name) | return _nova.novaclient(request).keypairs.get(name) | |||
@profiler.trace | @profiler.trace | |||
def server_create(request, name, image, flavor, key_name, user_data, | def server_create(request, name, image, flavor, key_name, user_data, | |||
security_groups, block_device_mapping=None, | security_groups, block_device_mapping=None, | |||
block_device_mapping_v2=None, nics=None, | block_device_mapping_v2=None, nics=None, | |||
availability_zone=None, instance_count=1, admin_pass=None, | availability_zone=None, instance_count=1, admin_pass=None, | |||
disk_config=None, config_drive=None, meta=None, | disk_config=None, config_drive=None, meta=None, | |||
scheduler_hints=None, description=None): | scheduler_hints=None, description=None): | |||
microversion = get_microversion(request, ("instance_description", | microversion = get_microversion(request, ("multiattach", | |||
"instance_description", | ||||
"auto_allocated_network")) | "auto_allocated_network")) | |||
nova_client = _nova.novaclient(request, version=microversion) | nova_client = _nova.novaclient(request, version=microversion) | |||
# NOTE(amotoki): Handling auto allocated network | # NOTE(amotoki): Handling auto allocated network | |||
# Nova API 2.37 or later, it accepts a special string 'auto' for nics | # Nova API 2.37 or later, it accepts a special string 'auto' for nics | |||
# which means nova uses a network that is available for a current project | # which means nova uses a network that is available for a current project | |||
# if one exists and otherwise it creates a network automatically. | # if one exists and otherwise it creates a network automatically. | |||
# This special handling is processed here as JS side assumes 'nics' | # This special handling is processed here as JS side assumes 'nics' | |||
# is a list and it is easiest to handle it here. | # is a list and it is easiest to handle it here. | |||
if nics: | if nics: | |||
End of changes. 1 change blocks. | ||||
1 lines changed or deleted | 2 lines changed or added |