Additional ssh tests with tempest
The run_ssh option is used on the default 'false',
so several test case and validation step was disabled.
It was disabled because:
* Admin password injection with the cirros image is not supported.
(We 'cannot' inject password/shadow to a ram disk.)
* In the current system setup floating IP is required for connecting
with neutron
The run_ssh boolean option will be removed from tempest, it will be replaced
with ssh_connect_method and ssh_auth_method.
Since using a floating ip with nova flat network is not required in these
case, the 'fixed'/private IPs (ssh_connect_method) will be used with nova network
, and we will use the 'floating' IPs with neutron when the NAMESPACES
are enabled(default).
The default value of ssh_auth_method is keypair, it works in both cases.
Change-Id: I3d47811d801985687526749a430ed6db64224f99
Attila Fazekas authored on 2013/10/21 16:27:18Showing 1 changed files
| ... | ... |
@@ -75,6 +75,7 @@ function configure_tempest() {
|
| 75 | 75 |
local public_router_id |
| 76 | 76 |
local tenant_networks_reachable |
| 77 | 77 |
local boto_instance_type="m1.tiny" |
| 78 |
+ local ssh_connect_method="fixed" |
|
| 78 | 79 |
|
| 79 | 80 |
# TODO(afazekas): |
| 80 | 81 |
# sudo python setup.py deploy |
| ... | ... |
@@ -182,10 +183,13 @@ function configure_tempest() {
|
| 182 | 182 |
|
| 183 | 183 |
if [ "$Q_USE_NAMESPACE" != "False" ]; then |
| 184 | 184 |
tenant_networks_reachable=false |
| 185 |
+ ssh_connect_method="floating" |
|
| 185 | 186 |
else |
| 186 | 187 |
tenant_networks_reachable=true |
| 187 | 188 |
fi |
| 188 | 189 |
|
| 190 |
+ ssh_connect_method=${TEMPEST_SSH_CONNECT_METHOD:-$ssh_connect_method}
|
|
| 191 |
+ |
|
| 189 | 192 |
if is_service_enabled q-l3; then |
| 190 | 193 |
public_network_id=$(neutron net-list | grep $PUBLIC_NETWORK_NAME | \ |
| 191 | 194 |
awk '{print $2}')
|
| ... | ... |
@@ -248,6 +252,7 @@ function configure_tempest() {
|
| 248 | 248 |
iniset $TEMPEST_CONF compute flavor_ref_alt $flavor_ref_alt |
| 249 | 249 |
iniset $TEMPEST_CONF compute live_migration_available ${LIVE_MIGRATION_AVAILABLE:-False}
|
| 250 | 250 |
iniset $TEMPEST_CONF compute use_block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
|
| 251 |
+ iniset $TEMPEST_CONF compute ssh_connect_method $ssh_connect_method |
|
| 251 | 252 |
|
| 252 | 253 |
# Compute admin |
| 253 | 254 |
iniset $TEMPEST_CONF "compute-admin" password "$password" # DEPRECATED |