openstack
/
magnum
Code Issues Proposed changes

Enabld conductor check new template path 

The conductor should check template in k8s_atomic_template_path
or k8s_coreos_template_path

Change-Id: I2a36ce96803f60b0159a153d5bc06ae29ec09862
Closes-Bug: #1442477
This commit is contained in:
digambar 2015-04-13 12:20:12 +08:00 committed by Jay Lau (Guangya Liu)
parent d2a2414c46
commit 1df02fd9b1
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
magnum/cmd/conductor.py
View File

@ -47,9 +47,13 @@ def main():
bay_k8s_heat.Handler()
]
if not os.path.isfile(cfg.CONF.k8s_heat.template_path):
LOG.error(_LE("The Heat template %s is not found. Install template.")
% (cfg.CONF.k8s_heat.template_path))
if (not os.path.isfile(cfg.CONF.bay.k8s_atomic_template_path)
and not os.path.isfile(cfg.CONF.bay.k8s_coreos_template_path)):
LOG.error(_LE("The Heat template for both k8s atomic "
"%(atomic_template)s and coreos (coreos_template)%s "
"can not be found. Install template.") %
{'atomic_template': cfg.CONF.bay.k8s_atomic_template_path,
'coreos_template': cfg.CONF.bay.k8s_coreos_template_path})
exit(-1)
server = service.Service(cfg.CONF.conductor.topic,