summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--deploy/adapters/ansible/openstack/templates/nova.conf4
-rw-r--r--deploy/client.py5
-rw-r--r--deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml12
-rw-r--r--deploy/conf/virtual.conf2
4 files changed, 11 insertions, 12 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():
diff --git a/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml b/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
index 38e5b6e8..2b426b42 100644
--- a/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei_us_lab/pod1/network.yml
@@ -75,16 +75,16 @@ public_vip:
interface: external
public_net_info:
- enable: False
+ enable: True
network: ext-net
type: vlan
- segment_id: 1000
+ segment_id: 1411
subnet: ext-subnet
provider_network: physnet
router: router-ext
enable_dhcp: False
no_gateway: False
- external_gw: "192.168.50.1"
- floating_ip_cidr: "192.168.50.0/24"
- floating_ip_start: "192.168.50.221"
- floating_ip_end: "192.168.50.231"
+ external_gw: "192.168.140.1"
+ floating_ip_cidr: "192.168.140.0/24"
+ floating_ip_start: "192.168.140.121"
+ floating_ip_end: "192.168.140.231"
diff --git a/deploy/conf/virtual.conf b/deploy/conf/virtual.conf
index 611aca76..0475ee9b 100644
--- a/deploy/conf/virtual.conf
+++ b/deploy/conf/virtual.conf
@@ -1,7 +1,7 @@
export VIRT_NUMBER=5
export VIRT_CPUS=4
export VIRT_MEM=16384
-export VIRT_DISK=50G
+export VIRT_DISK=200G
export SWITCH_IPS="1.1.1.1"
export SWITCH_CREDENTIAL="version=2c,community=public"