x/daisycloud-core
Code Issues Proposed changes

Merge "SSH found that the host instantiation template does not change the discovery mode" into stable/mitaka

Browse Source
This commit is contained in:
Jenkins
2017-02-21 03:38:00 +00:00
committed by Gerrit Code Review
parent 1af947922c 8c9c65165d
commit d13d3cf7f4
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
code/daisy/daisy/api/v1/host_template.py
View File

@@ -482,7 +482,8 @@ class Controller(controller.BaseController):
host_id) host_id)
ignore_ssh_key_list = ["root_disk", "root_lv_size", "swap_lv_size", ignore_ssh_key_list = ["root_disk", "root_lv_size", "swap_lv_size",
"isolcpus", "os_version_file", "os_version_id", "isolcpus", "os_version_file", "os_version_id",
"root_pwd", "hugepages", "hugepagesize"] "root_pwd", "hugepages", "hugepagesize",
"discover_mode"]
if ssh_host_flag: if ssh_host_flag:
for ignore_key in ignore_ssh_key_list: for ignore_key in ignore_ssh_key_list:
if host_template_used.get(ignore_key, None): if host_template_used.get(ignore_key, None):