Browse Source

Merge "Revert "temporary disable functional tests"" into stable/train

changes/15/747215/1
Zuul 1 month ago
committed by Gerrit Code Review
parent
commit
5be96069c5
3 changed files with 0 additions and 7 deletions
  1. +0
    -3
      devstack/plugin.sh
  2. +0
    -1
      doc/source/install/configuration.rst
  3. +0
    -3
      install.sh

+ 0
- 3
devstack/plugin.sh View File

@@ -44,8 +44,6 @@ EC2API_ADMIN_USER=${EC2API_ADMIN_USER:-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
if [[ -d $EC2API_DIR/bin ]]; then
EC2API_BIN_DIR=$EC2API_DIR/bin
@@ -233,7 +231,6 @@ function configure_ec2api {
iniset $NOVA_CONF neutron service_metadata_proxy True
fi
iniset $EC2API_CONF_FILE cache enabled True
iniset $EC2API_CONF_FILE cache backend "$CACHE_BACKEND"

if create_x509_server_key; then
iniset $EC2API_CONF_FILE DEFAULT x509_root_private_key "$CA_KEY"


+ 0
- 1
doc/source/install/configuration.rst View File

@@ -52,7 +52,6 @@ and cache if you want to use it.
.. code-block:: ini

[cache]
backend = oslo_cache.dict
enabled = True

You can look for other configuration options in the `Configuration Reference`_


+ 0
- 3
install.sh View File

@@ -17,8 +17,6 @@ APIPASTE_FILE=$CONF_DIR/api-paste.ini
DATA_DIR=${DATA_DIR:-/var/lib/ec2api}
AUTH_CACHE_DIR=${AUTH_CACHE_DIR:-/var/cache/ec2api}

CACHE_BACKEND='oslo_cache.dict'

#Check for environment
if [[ -z "$OS_AUTH_URL" || -z "$OS_USERNAME" || -z "$OS_PASSWORD" ]]; then
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"
iniset $CONF_FILE $GROUP_CACHE enabled True
iniset $CONF_FILE $GROUP_CACHE backend "$CACHE_BACKEND"

if [[ -f "$NOVA_CONF" ]]; then
# NOTE(ft): use swift instead internal s3 server if enabled


Loading…
Cancel
Save