diff --git a/code/daisy/daisy/api/backends/kolla/common.py b/code/daisy/daisy/api/backends/kolla/common.py index 90e5932c..42d297d1 100755 --- a/code/daisy/daisy/api/backends/kolla/common.py +++ b/code/daisy/daisy/api/backends/kolla/common.py @@ -441,7 +441,7 @@ def version_load_mcast(kolla_version_pkg_file, hosts_list): # TODO: impl. daisy_conf_mcast_enabled daisy_conf_mcast_enabled = _daisy_conf_mcast_flag() - if daisy_conf_mcast_enabled != True: + if daisy_conf_mcast_enabled != 'True': return -1 mcobjset = [] mcobj = MulticastServerTask(kolla_version_pkg_file, hosts_list) diff --git a/code/daisy/daisy/api/backends/kolla/install.py b/code/daisy/daisy/api/backends/kolla/install.py index 27e7ec61..c2a46991 100755 --- a/code/daisy/daisy/api/backends/kolla/install.py +++ b/code/daisy/daisy/api/backends/kolla/install.py @@ -609,8 +609,8 @@ class KOLLAInstallTask(Thread): raise exception.InstallException(self.message) else: self.progress = _calc_progress(self.log_file) - if execute_times >= 720: - self.message = "KOLLA deploy openstack timeout for an hour" + if execute_times >= 1440: + self.message = "KOLLA deploy openstack timeout" LOG.error(self.message) raise exception.InstallTimeoutException( cluster_id=self.cluster_id) diff --git a/code/daisy/etc/daisy-api.conf b/code/daisy/etc/daisy-api.conf index 098dc3a9..2dd6301e 100755 --- a/code/daisy/etc/daisy-api.conf +++ b/code/daisy/etc/daisy-api.conf @@ -48,10 +48,10 @@ workers = 4 # max_header_line = 16384 # Maximum number of hosts install os at the same time. -max_parallel_os_number = 10 +max_parallel_os_number = 20 # Maximum number of hosts upgrade os at the same time. -max_parallel_os_upgrade_number = 10 +max_parallel_os_upgrade_number = 20 # Role used to identify an authenticated user as administrator #admin_role = admin diff --git a/tools/daisy-utils/daisy.conf b/tools/daisy-utils/daisy.conf index be76171e..ff91481f 100755 --- a/tools/daisy-utils/daisy.conf +++ b/tools/daisy-utils/daisy.conf @@ -8,7 +8,7 @@ daisy_management_ip= #If you want to create a cluster with more than one backend, #all backend names should be provided for this configuration item, #such as, default_backend_types=tecs,zenic,proton,kolla. -default_backend_types=tecs +default_backend_types=kolla [OS] #Default os install types of daisy @@ -34,5 +34,6 @@ client_ip_begin=99.99.1.50 client_ip_end=99.99.1.150 [multicast] -#enabled multicast or not. +#enabled multicast or not.if enabled multicast please set this to 'True'. +#such as daisy_conf_mcast_enabled=True daisy_conf_mcast_enabled=False