From 9067d1be1059fa1aa5ff9ac1f9e19f1e483e2af0 Mon Sep 17 00:00:00 2001 From: Dheeraj Gautam Date: Thu, 12 Feb 2015 10:30:51 -0800 Subject: [PATCH] SM-Storage: Moved Live-Migration config from server to cluster. Unit testing: 1. Provisioned cluster live-migration disabled/enabled. Change-Id: I13805fd66bab769117d8b980b8fc1e695b88ca38 --- src/server_mgr_main.py | 29 ++++++++++++----------------- 1 file changed, 12 insertions(+), 17 deletions(-) diff --git a/src/server_mgr_main.py b/src/server_mgr_main.py index fcbbfa60..4ae7412a 100755 --- a/src/server_mgr_main.py +++ b/src/server_mgr_main.py @@ -3019,23 +3019,18 @@ def provision_server(self): else: pass - for role_server in role_servers['storage-master']: - server_params_master = eval(role_server['parameters']) - if 'live_migration' in server_params_master and server_params_master['live_migration'] == "enable": - if 'live_migration_nfs_vm_host' in server_params_master and len(server_params_master['live_migration_nfs_vm_host']) > 0 : - live_migration = "enable" - live_migration_host = server_params_master['live_migration_nfs_vm_host'] - else: - live_migration = "disable" - live_migration_host = "" - - if 'live_migration_storage_scope' in server_params_master : - live_migration_storage_scope = server_params_master['live_migration_storage_scope'] - else: - pass - - else: - pass + if 'live_migration' in cluster_params.keys() and cluster_params['live_migration'] == "enable": + if 'live_migration_nfs_vm_host' in cluster_params.keys() and cluster_params['live_migration_nfs_vm_host'] and len(cluster_params['live_migration_nfs_vm_host']) > 0 : + live_migration = "enable" + live_migration_host = cluster_params['live_migration_nfs_vm_host'] + else: + live_migration = "disable" + live_migration_host = "" + + if 'live_migration_storage_scope' in cluster_params.keys() and cluster_params['live_migration_storage_scope']: + live_migration_storage_scope = cluster_params['live_migration_storage_scope'] + else: + pass if live_migration_storage_scope == "local" or live_migration_storage_scope == "global": pass