turn on disable_ec2_classic
Change-Id: Ic3a84c1454f1c21830c2d0ac7dcc7f903519278b
This commit is contained in:
parent
0ee47eb58e
commit
420d4b6f4c
@ -152,6 +152,7 @@ function configure_ec2api_networking {
|
|||||||
|
|
||||||
if [[ ,${ENABLED_SERVICES} =~ ,"q-" ]]; then
|
if [[ ,${ENABLED_SERVICES} =~ ,"q-" ]]; then
|
||||||
iniset $EC2API_CONF_FILE DEFAULT full_vpc_support True
|
iniset $EC2API_CONF_FILE DEFAULT full_vpc_support True
|
||||||
|
iniset $EC2API_CONF_FILE DEFAULT disable_ec2_api True
|
||||||
else
|
else
|
||||||
iniset $EC2API_CONF_FILE DEFAULT full_vpc_support False
|
iniset $EC2API_CONF_FILE DEFAULT full_vpc_support False
|
||||||
fi
|
fi
|
||||||
|
@ -217,8 +217,10 @@ function copynovaopt() {
|
|||||||
|
|
||||||
if [[ -n $(openstack catalog show network) ]]; then
|
if [[ -n $(openstack catalog show network) ]]; then
|
||||||
VPC_SUPPORT="True"
|
VPC_SUPPORT="True"
|
||||||
|
DISABLE_EC2_CLASSIC="True"
|
||||||
else
|
else
|
||||||
VPC_SUPPORT="False"
|
VPC_SUPPORT="False"
|
||||||
|
DISABLE_EC2_CLASSIC="False"
|
||||||
fi
|
fi
|
||||||
if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then
|
if [[ "$VPC_SUPPORT" == "True" && -z "$EXTERNAL_NETWORK" ]]; then
|
||||||
declare -a newtron_output
|
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 DEFAULT keystone_ec2_tokens_url "$OS_AUTH_URL/v3/ec2tokens"
|
||||||
iniset $CONF_FILE database connection "$CONNECTION"
|
iniset $CONF_FILE database connection "$CONNECTION"
|
||||||
iniset $CONF_FILE DEFAULT full_vpc_support "$VPC_SUPPORT"
|
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"
|
iniset $CONF_FILE DEFAULT external_network "$EXTERNAL_NETWORK"
|
||||||
|
|
||||||
GROUP_AUTHTOKEN="keystone_authtoken"
|
GROUP_AUTHTOKEN="keystone_authtoken"
|
||||||
|
Loading…
Reference in New Issue
Block a user