x/daisycloud-core
Code Issues Proposed changes

Merge "change daisy_conf_file to a global variable"

Browse Source
This commit is contained in:
Jenkins 2016-10-08 01:28:33 +00:00 committed by Gerrit Code Review
commit 4981d083c4
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
code/daisy/daisy/api/backends/common.py
View File

@ -32,6 +32,7 @@ _LE = i18n._LE
_LI = i18n._LI
_LW = i18n._LW
daisy_conf_file = '/home/daisy_install/daisy.conf'
daisy_path = '/var/lib/daisy/'
tecs_backend_name = "tecs"
zenic_backend_name = "zenic"

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

@ -65,7 +65,6 @@ daisy_kolla_path = kolla_cmn.daisy_kolla_path
install_kolla_progress = 0.0
install_mutex = threading.Lock()
kolla_file = "/home/kolla_install"
daisy_conf_file = "/home/daisy_install"
def update_progress_to_db(req, role_id_list,
@ -163,7 +162,7 @@ def _check_ping_hosts(ping_ips, max_ping_times):
def _get_local_ip():
config = ConfigParser.ConfigParser()
config.read("%s/daisy.conf" % daisy_conf_file)
config.read(daisy_cmn.daisy_conf_file)
local_ip = config.get("DEFAULT", "daisy_management_ip")
return local_ip

2
code/daisy/daisy/api/v1/hosts.py
View File

@ -1997,7 +1997,7 @@ class Controller(controller.BaseController):
self.get_cluster_meta_or_404(req, cluster_id)
config = ConfigParser.ConfigParser()
config.read("/home/daisy_install/daisy.conf")
config.read(daisy_cmn.daisy_conf_file)
daisy_management_ip = config.get("DEFAULT", "daisy_management_ip")
if daisy_management_ip:
cmd = 'dhcp_linenumber=`grep -n "dhcp_ip="' \