From 270f93e526e58d48bf8cc336425491d89766a2d0 Mon Sep 17 00:00:00 2001 From: Matthew Treinish Date: Thu, 20 Mar 2014 21:18:42 +0000 Subject: [PATCH] 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 --- lib/tempest | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/tempest b/lib/tempest index b1644550f6..a4558cedc1 100644 --- a/lib/tempest +++ b/lib/tempest @@ -277,7 +277,6 @@ function configure_tempest { fi # Compute - iniset $TEMPEST_CONFIG compute change_password_available False iniset $TEMPEST_CONFIG compute allow_tenant_isolation ${TEMPEST_ALLOW_TENANT_ISOLATION:-True} iniset $TEMPEST_CONFIG compute ssh_user ${DEFAULT_INSTANCE_USER:-cirros} # DEPRECATED iniset $TEMPEST_CONFIG compute network_for_ssh $PRIVATE_NETWORK_NAME @@ -289,12 +288,13 @@ function configure_tempest { iniset $TEMPEST_CONFIG compute image_alt_ssh_user ${DEFAULT_INSTANCE_USER:-cirros} iniset $TEMPEST_CONFIG compute flavor_ref $flavor_ref iniset $TEMPEST_CONFIG compute flavor_ref_alt $flavor_ref_alt - iniset $TEMPEST_CONFIG compute live_migration_available ${LIVE_MIGRATION_AVAILABLE:-False} - iniset $TEMPEST_CONFIG compute use_block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False} iniset $TEMPEST_CONFIG compute ssh_connect_method $ssh_connect_method # Compute Features iniset $TEMPEST_CONFIG compute-feature-enabled resize True + iniset $TEMPEST_CONFIG compute-feature-enabled live_migration ${LIVE_MIGRATION_AVAILABLE:-False} + iniset $TEMPEST_CONFIG compute-feature-enabled change_password False + iniset $TEMPEST_CONFIG compute-feature-enabled block_migration_for_live_migration ${USE_BLOCK_MIGRATION_FOR_LIVE_MIGRATION:-False} # Compute admin iniset $TEMPEST_CONFIG "compute-admin" username $ADMIN_USERNAME