... | ... |
@@ -2258,6 +2258,14 @@ function maskip { |
2258 | 2258 |
echo $subnet |
2259 | 2259 |
} |
2260 | 2260 |
|
2261 |
+function is_provider_network { |
|
2262 |
+ if [ "$Q_USE_PROVIDER_NETWORKING" == "True" ]; then |
|
2263 |
+ return 0 |
|
2264 |
+ fi |
|
2265 |
+ return 1 |
|
2266 |
+} |
|
2267 |
+ |
|
2268 |
+ |
|
2261 | 2269 |
# Return the current python as "python<major>.<minor>" |
2262 | 2270 |
function python_version { |
2263 | 2271 |
local python_version |
... | ... |
@@ -432,13 +432,6 @@ function _neutron_configure_router_v6 { |
432 | 432 |
fi |
433 | 433 |
} |
434 | 434 |
|
435 |
-function is_provider_network { |
|
436 |
- if [ "$Q_USE_PROVIDER_NETWORKING" == "True" ]; then |
|
437 |
- return 0 |
|
438 |
- fi |
|
439 |
- return 1 |
|
440 |
-} |
|
441 |
- |
|
442 | 435 |
function is_networking_extension_supported { |
443 | 436 |
local extension=$1 |
444 | 437 |
# TODO(sc68cal) cache this instead of calling every time |
... | ... |
@@ -421,12 +421,17 @@ function configure_tempest { |
421 | 421 |
iniset $TEMPEST_CONFIG scenario ari_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-initrd" |
422 | 422 |
iniset $TEMPEST_CONFIG scenario aki_img_file "cirros-${CIRROS_VERSION}-${CIRROS_ARCH}-vmlinuz" |
423 | 423 |
|
424 |
+ # If using provider networking, use the physical network for validation rather than private |
|
425 |
+ TEMPEST_SSH_NETWORK_NAME=$PRIVATE_NETWORK_NAME |
|
426 |
+ if is_provider_network; then |
|
427 |
+ TEMPEST_SSH_NETWORK_NAME=$PHYSICAL_NETWORK |
|
428 |
+ fi |
|
424 | 429 |
# Validation |
425 | 430 |
iniset $TEMPEST_CONFIG validation run_validation ${TEMPEST_RUN_VALIDATION:-False} |
426 | 431 |
iniset $TEMPEST_CONFIG validation ip_version_for_ssh 4 |
427 | 432 |
iniset $TEMPEST_CONFIG validation ssh_timeout $BUILD_TIMEOUT |
428 | 433 |
iniset $TEMPEST_CONFIG validation image_ssh_user ${DEFAULT_INSTANCE_USER:-cirros} |
429 |
- iniset $TEMPEST_CONFIG validation network_for_ssh $PRIVATE_NETWORK_NAME |
|
434 |
+ iniset $TEMPEST_CONFIG validation network_for_ssh $TEMPEST_SSH_NETWORK_NAME |
|
430 | 435 |
|
431 | 436 |
# Volume |
432 | 437 |
# TODO(obutenko): Remove snapshot_backup when liberty-eol happens. |