set nova default floating pool for functest

JIRA: COMPASS-241

Change-Id: I53528db5162aa8149e0edce88efc2aa158d175bd
Signed-off-by: carey.xu <carey.xuhan@huawei.com>

diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index cec1144..5277359 100644 (file)
--- a/deploy/adapters/ansible/openstack/templates/nova.conf
+++ b/deploy/adapters/ansible/openstack/templates/nova.conf
@@ -22,9 +22,7 @@ api_paste_config=/etc/nova/api-paste.ini
 volumes_path=/var/lib/nova/volumes
 enabled_apis=osapi_compute,metadata
 
-vif_plugging_is_fatal: false
-vif_plugging_timeout: 0
-
+default_floating_pool={{ public_net_info.network }}
 auth_strategy = keystone
 
 rpc_backend = rabbit

diff --git a/deploy/client.py b/deploy/client.py
index 9bb0c5e..62d1288 100644 (file)
--- a/deploy/client.py
+++ b/deploy/client.py
@@ -856,6 +856,7 @@ class CompassClient(object):
                     )
                     break
                 else:
+                    time.sleep(5)
                     continue
 
             elif cluster_state['state'] == 'SUCCESSFUL':
@@ -926,9 +927,9 @@ def deploy():
     client.set_all_hosts_roles(cluster_id)
     client.deploy_clusters(cluster_id)
 
-    threading.Thread(target=client.get_installing_progress, args=(cluster_id,)).start()
     LOG.info("compass OS installtion is begin")
-    print_ansible_log()
+    threading.Thread(target=print_ansible_log).start()
+    client.get_installing_progress(cluster_id)
     client.check_dashboard_links(cluster_id)
 
 def redeploy():