openstack
/
ec2-api
Code Issues Proposed changes

Merge "turn on disable_ec2_classic"

This commit is contained in:
Jenkins 2017-03-02 14:57:20 +00:00 committed by Gerrit Code Review
parent 7a43735a31 420d4b6f4c
commit ab77bbe007
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
devstack/plugin.sh
View File

@ -152,6 +152,7 @@ function configure_ec2api_networking {
if [[ ,${ENABLED_SERVICES} =~ ,"q-" ]]; then
iniset $EC2API_CONF_FILE DEFAULT full_vpc_support True
iniset $EC2API_CONF_FILE DEFAULT disable_ec2_api True
else
iniset $EC2API_CONF_FILE DEFAULT full_vpc_support False
fi

3
install.sh
View File

@ -217,8 +217,10 @@ function copynovaopt() {
if [[ -n $(openstack catalog show network) ]]; then
VPC_SUPPORT="True"
DISABLE_EC2_CLASSIC="True"
else
VPC_SUPPORT="False"
DISABLE_EC2_CLASSIC="False"
fi
if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then
declare -a newtron_output
@ -272,6 +274,7 @@ iniset $CONF_FILE DEFAULT verbose True
iniset $CONF_FILE DEFAULT keystone_ec2_tokens_url "$OS_AUTH_URL/v3/ec2tokens"
iniset $CONF_FILE database connection "$CONNECTION"
iniset $CONF_FILE DEFAULT full_vpc_support "$VPC_SUPPORT"
iniset $CONF_FILE DEFAULT disable_ec2_classic "$DISABLE_EC2_CLASSIC"
iniset $CONF_FILE DEFAULT external_network "$EXTERNAL_NETWORK"
GROUP_AUTHTOKEN="keystone_authtoken"