openstack/devstack-gate
Code Issues Proposed changes

Merge "Remove arbitrary devstack config options"

Browse Source
This commit is contained in:
Jenkins
2015-05-13 13:11:56 +00:00
committed by Gerrit Code Review
parent 857b1275c0 33fc1efab2
commit 40bcfaedf6
2 changed files with 0 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
devstack-vm-gate-wrap.sh
View File

@@ -225,19 +225,9 @@ export DEVSTACK_GATE_ZAQAR=${DEVSTACK_GATE_ZAQAR:-0}
# Set to 0 to disable config_drive and use the metadata server instead
export DEVSTACK_GATE_CONFIGDRIVE=${DEVSTACK_GATE_CONFIGDRIVE:-1}
# Set to 1 to enable running a keystone v3 based gate
export DEVSTACK_GATE_KEYSTONE_V3=${DEVSTACK_GATE_KEYSTONE_V3:-0}
# Set to 1 to enable installing test requirements
export DEVSTACK_GATE_INSTALL_TESTONLY=${DEVSTACK_GATE_INSTALL_TESTONLY:-0}
# Set to 0 to run services that default under Apache + mod_wsgi under alternatives (e.g. eventlet)
# if possible
export DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES=${DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES:-1}
# Set to 1 to replace Nova V2 endpoint with V2.1 API
export DEVSTACK_GATE_NOVA_REPLACE_V2_ENDPOINT_WITH_V21_API=${DEVSTACK_GATE_NOVA_REPLACE_V2_ENDPOINT_WITH_V21_API:-0}
# Set the number of threads to run tempest with
DEFAULT_CONCURRENCY=$(nproc)
if [ ${DEFAULT_CONCURRENCY} -gt 3 ] ; then

16
devstack-vm-gate.sh
View File

@@ -341,18 +341,6 @@ EOF
else
echo "FORCE_CONFIG_DRIVE=False" >>"$localrc_file"
fi
if [[ "$DEVSTACK_GATE_KEYSTONE_V3" -eq "1" ]]; then
# Run gate using only keystone v3
# For now this is only injected in tempest configuration
echo "TEMPEST_AUTH_VERSION=v3" >>"$localrc_file"
fi
if [[ "$DEVSTACK_GATE_ENABLE_HTTPD_MOD_WSGI_SERVICES" -eq "0" ]]; then
# Services that default to run under Apache + mod_wsgi will use alternatives
# (e.g. Keystone under eventlet) if available. This will affect all services
# that run under HTTPD (mod_wsgi) by default.
echo "ENABLE_HTTPD_MOD_WSGI_SERVICES=False" >> "$localrc_file"
fi
if [[ "$CEILOMETER_NOTIFICATION_TOPICS" ]]; then
# Add specified ceilometer notification topics to localrc
@@ -360,10 +348,6 @@ EOF
echo "CEILOMETER_NOTIFICATION_TOPICS=$CEILOMETER_NOTIFICATION_TOPICS" >>"$localrc_file"
fi
if [[ "$DEVSTACK_GATE_NOVA_REPLACE_V2_ENDPOINT_WITH_V21_API" -eq "1" ]]; then
echo "NOVA_API_VERSION=v21default" >> "$localrc_file"
fi
if [[ "$DEVSTACK_GATE_INSTALL_TESTONLY" -eq "1" ]]; then
# Sometimes we do want the test packages
echo "INSTALL_TESTONLY_PACKAGES=True" >> "$localrc_file"