x/daisycloud-core
Code Issues Proposed changes

Solve OpenStack Update error

Browse Source 
Change-Id: I7b1bebe8579dd6df5e78e5fec69ccd5489be4a51
Signed-off-by: Zhijiang Hu <hu.zhijiang@zte.com.cn>
This commit is contained in:
Zhijiang Hu
2017-08-28 23:32:34 +08:00
parent 86af78213c
commit c099964abb
1 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
code/daisy/daisy/api/backends/kolla/upgrade.py
View File

@@ -22,6 +22,7 @@ from oslo_log import log as logging
from daisy import i18n
import daisy.api.backends.common as daisy_cmn
import daisy.api.backends.kolla.common as kolla_cmn
from daisy.api.backends.kolla import config as kconfig
import daisy.registry.client.v1.api as registry
from threading import Thread
from daisy.common import exception
@@ -115,13 +116,19 @@ class KOLLAUpgradeTask(Thread):
hosts)
# always call generate_kolla_config_file after version_load()
LOG.info(_("begin to generate kolla config file ..."))
LOG.info(_("begin to re-generate kolla config file ..."))
(kolla_config, self.mgt_ip_list, host_name_ip_list) = \
kolla_cmn.get_cluster_kolla_config(self.req, self.cluster_id)
kolla_cmn.generate_kolla_config_file(self.req, self.cluster_id,
kolla_config, res)
LOG.info(_("generate kolla config file in /etc/kolla/ dir..."))
# generate_kolla_config_file() can not be used here, it not only
# update global.yml, but also update passwd.yml and redo some
# ssh commands(cause failure) on target nodes. So do not be
# misleaded by that bad function name, here we only want to
# update global.yml.
if kolla_config:
kconfig.update_globals_yml(kolla_config, res)
LOG.info(_("re-generate kolla config file in /etc/kolla/ dir..."))
hosts_ip_set = set()
for host in hosts:
host_meta = daisy_cmn.get_host_detail(self.req, host["host_id"])
host_ip = daisy_cmn.get_management_ip(host_meta)