turn on disable_ec2_classic

Change-Id: Ic3a84c1454f1c21830c2d0ac7dcc7f903519278b
This commit is contained in:
tikitavi 2017-02-28 14:37:52 +03:00
parent 0ee47eb58e
commit 420d4b6f4c
2 changed files with 4 additions and 0 deletions

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

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"