x/daisycloud-core
Code Issues Proposed changes

Merge "fix bug of read from conf file is str instead of flag"

Browse Source
This commit is contained in:
Jenkins 2017-05-02 09:09:35 +00:00 committed by Gerrit Code Review
commit 0cf10bf1da
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
code/daisy/daisy/api/backends/kolla/common.py
View File

@ -441,7 +441,7 @@ def version_load_mcast(kolla_version_pkg_file, hosts_list):
# TODO: impl. daisy_conf_mcast_enabled # TODO: impl. daisy_conf_mcast_enabled
daisy_conf_mcast_enabled = _daisy_conf_mcast_flag() daisy_conf_mcast_enabled = _daisy_conf_mcast_flag()
if daisy_conf_mcast_enabled != True: if daisy_conf_mcast_enabled != 'True':
return -1 return -1
mcobjset = [] mcobjset = []
mcobj = MulticastServerTask(kolla_version_pkg_file, hosts_list) mcobj = MulticastServerTask(kolla_version_pkg_file, hosts_list)

4
code/daisy/daisy/api/backends/kolla/install.py
View File

@ -609,8 +609,8 @@ class KOLLAInstallTask(Thread):
raise exception.InstallException(self.message) raise exception.InstallException(self.message)
else: else:
self.progress = _calc_progress(self.log_file) self.progress = _calc_progress(self.log_file)
if execute_times >= 720: if execute_times >= 1440:
self.message = "KOLLA deploy openstack timeout for an hour" self.message = "KOLLA deploy openstack timeout"
LOG.error(self.message) LOG.error(self.message)
raise exception.InstallTimeoutException( raise exception.InstallTimeoutException(
cluster_id=self.cluster_id) cluster_id=self.cluster_id)

4
code/daisy/etc/daisy-api.conf
View File

@ -48,10 +48,10 @@ workers = 4
# max_header_line = 16384 # max_header_line = 16384
# Maximum number of hosts install os at the same time. # 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. # 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 # Role used to identify an authenticated user as administrator
#admin_role = admin #admin_role = admin

5
tools/daisy-utils/daisy.conf
View File

@ -8,7 +8,7 @@ daisy_management_ip=
#If you want to create a cluster with more than one backend, #If you want to create a cluster with more than one backend,
#all backend names should be provided for this configuration item, #all backend names should be provided for this configuration item,
#such as, default_backend_types=tecs,zenic,proton,kolla. #such as, default_backend_types=tecs,zenic,proton,kolla.
default_backend_types=tecs default_backend_types=kolla
[OS] [OS]
#Default os install types of daisy #Default os install types of daisy
@ -34,5 +34,6 @@ client_ip_begin=99.99.1.50
client_ip_end=99.99.1.150 client_ip_end=99.99.1.150
[multicast] [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 daisy_conf_mcast_enabled=False