openstack
/
devstack
Code Issues Proposed changes

Merge "Allow provider network to be used for ssh validation"

This commit is contained in:
Jenkins 2016-11-28 10:28:47 +00:00 committed by Gerrit Code Review
parent e8f90d1e5b 7938d83d3b
commit f5e78b6fb6
3 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
functions-common
View File

@ -2258,6 +2258,14 @@ function maskip {
echo $subnet
}
function is_provider_network {
if [ "$Q_USE_PROVIDER_NETWORKING" == "True" ]; then
return 0
fi
return 1
}
# Return the current python as "python<major>.<minor>"
function python_version {
local python_version

7
lib/neutron_plugins/services/l3
View File

@ -432,13 +432,6 @@ function _neutron_configure_router_v6 {
fi
}
function is_provider_network {
if [ "$Q_USE_PROVIDER_NETWORKING" == "True" ]; then
return 0
fi
return 1
}
function is_networking_extension_supported {
local extension=$1
# TODO(sc68cal) cache this instead of calling every time

7
lib/tempest
View File

@ -421,12 +421,17 @@ function configure_tempest {
iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd"
iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz"
# If using provider networking, use the physical network for validation rather than private
TEMPEST_SSH_NETWORK_NAME=$PRIVATE_NETWORK_NAME
if is_provider_network; then
TEMPEST_SSH_NETWORK_NAME=$PHYSICAL_NETWORK
fi
# Validation
iniset $TEMPEST_CONFIG validation run_validation ${TEMPEST_RUN_VALIDATION:-False}
iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4
iniset $TEMPEST_CONFIG validation ssh_timeout $BUILD_TIMEOUT
iniset $TEMPEST_CONFIG validation image_ssh_user ${DEFAULT_INSTANCE_USER:-cirros}
iniset $TEMPEST_CONFIG validation network_for_ssh $PRIVATE_NETWORK_NAME
iniset $TEMPEST_CONFIG validation network_for_ssh $TEMPEST_SSH_NETWORK_NAME
# Volume
# TODO(obutenko): Remove snapshot_backup when liberty-eol happens.