starlingx/config
Code Issues Proposed changes

Fix host lock/unlock for kubernetes config

Browse Source 
Add kubernetes config checks before performing sysinv nova/cinder
actions done during host lock/unlock.

Change-Id: Ia1abd59d8e1a2b4691b503d9f807edd81ebe6dce
Closes-Bug: 1794849
Signed-off-by: Kevin Smith <kevin.smith@windriver.com>
This commit is contained in:
Kevin Smith 2018-09-30 19:36:52 -04:00
parent f8c7b2d830
commit 72cb1c60e4
1 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
sysinv/sysinv/sysinv/sysinv/conductor/manager.py
View File

@ -4197,7 +4197,12 @@ class ConductorManager(service.PeriodicService):
if not availability:
return
if cutils.host_has_function(ihost, constants.COMPUTE):
system = self.dbapi.isystem_get_one()
kubernetes_config = system.capabilities.get('kubernetes_enabled',
False)
if (cutils.host_has_function(ihost, constants.COMPUTE) and not
kubernetes_config):
if availability == constants.VIM_SERVICES_ENABLED:
# report to nova the host aggregate groupings now that
# the compute node is available
@ -4247,7 +4252,9 @@ class ConductorManager(service.PeriodicService):
self.dbapi,
constants.CINDER_BACKEND_LVM
)
if (storage_lvm and ihost.personality == constants.CONTROLLER):
if (storage_lvm and ihost.personality == constants.CONTROLLER and
not kubernetes_config):
LOG.debug("iplatform monitor check system has lvm backend")
cinder_device = cutils._get_cinder_device(self.dbapi, ihost.id)
idisks = self.dbapi.idisk_get_by_ihost(ihost_uuid)