Revert "temporary disable functional tests"
This reverts commit3d6106d99c
. Change-Id: I390634d5321d3f4210a5d378178c8d8b1e445e19 (cherry picked from commit1886d64d3e
)
This commit is contained in:
parent
fb16aa422b
commit
a9bcd94d25
|
@ -44,8 +44,6 @@ EC2API_ADMIN_USER=${EC2API_ADMIN_USER:-ec2api}
|
||||||
|
|
||||||
EC2API_KEYSTONE_SIGNING_DIR=${EC2API_KEYSTONE_SIGNING_DIR:-/tmp/keystone-signing-ec2api}
|
EC2API_KEYSTONE_SIGNING_DIR=${EC2API_KEYSTONE_SIGNING_DIR:-/tmp/keystone-signing-ec2api}
|
||||||
|
|
||||||
CACHE_BACKEND="oslo_cache.dict"
|
|
||||||
|
|
||||||
# Support entry points installation of console scripts
|
# Support entry points installation of console scripts
|
||||||
if [[ -d $EC2API_DIR/bin ]]; then
|
if [[ -d $EC2API_DIR/bin ]]; then
|
||||||
EC2API_BIN_DIR=$EC2API_DIR/bin
|
EC2API_BIN_DIR=$EC2API_DIR/bin
|
||||||
|
@ -233,7 +231,6 @@ function configure_ec2api {
|
||||||
iniset $NOVA_CONF neutron service_metadata_proxy True
|
iniset $NOVA_CONF neutron service_metadata_proxy True
|
||||||
fi
|
fi
|
||||||
iniset $EC2API_CONF_FILE cache enabled True
|
iniset $EC2API_CONF_FILE cache enabled True
|
||||||
iniset $EC2API_CONF_FILE cache backend "$CACHE_BACKEND"
|
|
||||||
|
|
||||||
if create_x509_server_key; then
|
if create_x509_server_key; then
|
||||||
iniset $EC2API_CONF_FILE DEFAULT x509_root_private_key "$CA_KEY"
|
iniset $EC2API_CONF_FILE DEFAULT x509_root_private_key "$CA_KEY"
|
||||||
|
|
|
@ -52,7 +52,6 @@ and cache if you want to use it.
|
||||||
.. code-block:: ini
|
.. code-block:: ini
|
||||||
|
|
||||||
[cache]
|
[cache]
|
||||||
backend = oslo_cache.dict
|
|
||||||
enabled = True
|
enabled = True
|
||||||
|
|
||||||
You can look for other configuration options in the `Configuration Reference`_
|
You can look for other configuration options in the `Configuration Reference`_
|
||||||
|
|
|
@ -17,8 +17,6 @@ APIPASTE_FILE=$CONF_DIR/api-paste.ini
|
||||||
DATA_DIR=${DATA_DIR:-/var/lib/ec2api}
|
DATA_DIR=${DATA_DIR:-/var/lib/ec2api}
|
||||||
AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api}
|
AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api}
|
||||||
|
|
||||||
CACHE_BACKEND='oslo_cache.dict'
|
|
||||||
|
|
||||||
#Check for environment
|
#Check for environment
|
||||||
if [[ -z "$OS_AUTH_URL" || -z "$OS_USERNAME" || -z "$OS_PASSWORD" ]]; then
|
if [[ -z "$OS_AUTH_URL" || -z "$OS_USERNAME" || -z "$OS_PASSWORD" ]]; then
|
||||||
echo "Please set OS_AUTH_URL, OS_USERNAME, OS_PASSWORD"
|
echo "Please set OS_AUTH_URL, OS_USERNAME, OS_PASSWORD"
|
||||||
|
@ -305,7 +303,6 @@ iniset $CONF_FILE $GROUP_AUTHTOKEN auth_type password
|
||||||
|
|
||||||
GROUP_CACHE="cache"
|
GROUP_CACHE="cache"
|
||||||
iniset $CONF_FILE $GROUP_CACHE enabled True
|
iniset $CONF_FILE $GROUP_CACHE enabled True
|
||||||
iniset $CONF_FILE $GROUP_CACHE backend "$CACHE_BACKEND"
|
|
||||||
|
|
||||||
if [[ -f "$NOVA_CONF" ]]; then
|
if [[ -f "$NOVA_CONF" ]]; then
|
||||||
# NOTE(ft): use swift instead internal s3 server if enabled
|
# NOTE(ft): use swift instead internal s3 server if enabled
|
||||||
|
|
Loading…
Reference in New Issue