summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/adapters/ansible/openstack/templates/nova.conf4
-rw-r--r--deploy/client.py5
2 files changed, 4 insertions, 5 deletions
diff --git a/deploy/adapters/ansible/openstack/templates/nova.conf b/deploy/adapters/ansible/openstack/templates/nova.conf
index cec11440..52773598 100644
--- 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 9bb0c5ed..62d12885 100644
--- 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():