Merge "turn on disable_ec2_classic in devstack installation"
This commit is contained in:
commit
0e3627252e
@ -151,6 +151,7 @@ function configure_ec2api_networking {
|
|||||||
if [[ -n "$ext_net" ]]; then
|
if [[ -n "$ext_net" ]]; then
|
||||||
iniset $EC2API_CONF_FILE DEFAULT external_network $ext_net
|
iniset $EC2API_CONF_FILE DEFAULT external_network $ext_net
|
||||||
fi
|
fi
|
||||||
|
iniset $EC2API_CONF_FILE DEFAULT disable_ec2_classic True
|
||||||
}
|
}
|
||||||
|
|
||||||
# Entry points
|
# Entry points
|
||||||
|
@ -1030,7 +1030,7 @@ def _populate_parsed_bdm_parameter(bdm, short_root_device_name):
|
|||||||
|
|
||||||
def _format_group_set(context, os_security_groups, groups):
|
def _format_group_set(context, os_security_groups, groups):
|
||||||
if not os_security_groups:
|
if not os_security_groups:
|
||||||
return None
|
return []
|
||||||
return [{'groupName': sg['name'],
|
return [{'groupName': sg['name'],
|
||||||
'groupId': groups[sg['name']]}
|
'groupId': groups[sg['name']]}
|
||||||
for sg in os_security_groups
|
for sg in os_security_groups
|
||||||
|
@ -164,7 +164,7 @@ def _create_vpc(context, cidr_block, is_default=False):
|
|||||||
|
|
||||||
|
|
||||||
def _check_and_create_default_vpc(context):
|
def _check_and_create_default_vpc(context):
|
||||||
if CONF.disable_ec2_classic:
|
if CONF.disable_ec2_classic and not context.is_os_admin:
|
||||||
for vpc in db_api.get_items(context, 'vpc'):
|
for vpc in db_api.get_items(context, 'vpc'):
|
||||||
if vpc.get('is_default'):
|
if vpc.get('is_default'):
|
||||||
return vpc
|
return vpc
|
||||||
|
Loading…
Reference in New Issue
Block a user