openstack/devstack
Code Issues Proposed changes

Merge "Additional ssh tests with tempest"

Browse Source
This commit is contained in:
Jenkins 2013-11-25 15:58:07 +00:00 committed by Gerrit Code Review
commit 1e624fae30
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
lib/tempest
View File

@ -80,6 +80,7 @@ function configure_tempest() {
local public_router_id local public_router_id
local tenant_networks_reachable local tenant_networks_reachable
local boto_instance_type="m1.tiny" local boto_instance_type="m1.tiny"
local ssh_connect_method="fixed"
# TODO(afazekas): # TODO(afazekas):
# sudo python setup.py deploy # sudo python setup.py deploy
@ -192,10 +193,13 @@ function configure_tempest() {
if [ "$Q_USE_NAMESPACE" != "False" ]; then if [ "$Q_USE_NAMESPACE" != "False" ]; then
tenant_networks_reachable=false tenant_networks_reachable=false
ssh_connect_method="floating"
else else
tenant_networks_reachable=true tenant_networks_reachable=true
fi fi
ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
if is_service_enabled q-l3; then if is_service_enabled q-l3; then
public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \ public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \
awk '{print $2}') awk '{print $2}')
@ -258,6 +262,7 @@ function configure_tempest() {
iniset $TEMPEST_CONF compute flavor_ref_alt $flavor_ref_alt iniset $TEMPEST_CONF compute flavor_ref_alt $flavor_ref_alt
iniset $TEMPEST_CONF compute live_migration_available ${LIVE_MIGRATION_AVAILABLE:-False} iniset $TEMPEST_CONF compute live_migration_available ${LIVE_MIGRATION_AVAILABLE:-False}
iniset $TEMPEST_CONF compute use_block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False} iniset $TEMPEST_CONF compute use_block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
iniset $TEMPEST_CONF compute ssh_connect_method $ssh_connect_method
# Compute admin # Compute admin
iniset $TEMPEST_CONF "compute-admin" password "$password" # DEPRECATED iniset $TEMPEST_CONF "compute-admin" password "$password" # DEPRECATED