Browse code
Fix incorrect tempest config groups
This commit fixes a couple of tempest config options that were being
iniset to the wrong config group. This wasn't caught in the gate
because the default behaviors matched.
Change-Id: I273db85ba310faa1ba7662a42f951a1ee97b431b
Matthew Treinish authored on 2014/03/21 06:18:42Showing 1 changed files
| ... | ... |
@@ -277,7 +277,6 @@ function configure_tempest {
|
| 277 | 277 |
fi |
| 278 | 278 |
|
| 279 | 279 |
# Compute |
| 280 |
- iniset $TEMPEST_CONFIG compute change_password_available False |
|
| 281 | 280 |
iniset $TEMPEST_CONFIG compute allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True}
|
| 282 | 281 |
iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED
|
| 283 | 282 |
iniset $TEMPEST_CONFIG compute network_for_ssh $PRIVATE_NETWORK_NAME |
| ... | ... |
@@ -289,12 +288,13 @@ function configure_tempest {
|
| 289 | 289 |
iniset $TEMPEST_CONFIG compute image_alt_ssh_user ${DEFAULT_INSTANCE_USER:-cirros}
|
| 290 | 290 |
iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref |
| 291 | 291 |
iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt |
| 292 |
- iniset $TEMPEST_CONFIG compute live_migration_available ${LIVE_MIGRATION_AVAILABLE:-False}
|
|
| 293 |
- iniset $TEMPEST_CONFIG compute use_block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
|
|
| 294 | 292 |
iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method |
| 295 | 293 |
|
| 296 | 294 |
# Compute Features |
| 297 | 295 |
iniset $TEMPEST_CONFIG compute-feature-enabled resize True |
| 296 |
+ iniset $TEMPEST_CONFIG compute-feature-enabled live_migration ${LIVE_MIGRATION_AVAILABLE:-False}
|
|
| 297 |
+ iniset $TEMPEST_CONFIG compute-feature-enabled change_password False |
|
| 298 |
+ iniset $TEMPEST_CONFIG compute-feature-enabled block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False}
|
|
| 298 | 299 |
|
| 299 | 300 |
# Compute admin |
| 300 | 301 |
iniset $TEMPEST_CONFIG "compute-admin" username $ADMIN_USERNAME |