Merge remote-tracking branch 'starlingx/master' into HEAD
Change-Id: Ie189e195fb4972803bc10dcb18fcac437ec8a6ea Signed-off-by: Scott Little <scott.little@windriver.com>
This commit is contained in:
commit
75d2199c4a
@ -172,8 +172,9 @@ class EnableHostTask(state_machine.StateTask):
|
|||||||
self, host, objects.HOST_SERVICES.GUEST))
|
self, host, objects.HOST_SERVICES.GUEST))
|
||||||
task_work_list.append(NotifyHostServicesEnabledTaskWork(
|
task_work_list.append(NotifyHostServicesEnabledTaskWork(
|
||||||
self, host, force_pass=True))
|
self, host, force_pass=True))
|
||||||
task_work_list.append(QueryHypervisorTaskWork(
|
if host.host_service_configured(objects.HOST_SERVICES.COMPUTE):
|
||||||
self, host, force_pass=True))
|
task_work_list.append(QueryHypervisorTaskWork(
|
||||||
|
self, host, force_pass=True))
|
||||||
super(EnableHostTask, self).__init__(
|
super(EnableHostTask, self).__init__(
|
||||||
'enable-host_%s' % host.name, task_work_list)
|
'enable-host_%s' % host.name, task_work_list)
|
||||||
|
|
||||||
@ -236,8 +237,9 @@ class DisableHostTask(state_machine.StateTask):
|
|||||||
if host.host_service_configured(objects.HOST_SERVICES.CONTAINER):
|
if host.host_service_configured(objects.HOST_SERVICES.CONTAINER):
|
||||||
task_work_list.append(DisableHostServicesTaskWork(
|
task_work_list.append(DisableHostServicesTaskWork(
|
||||||
self, host, objects.HOST_SERVICES.CONTAINER))
|
self, host, objects.HOST_SERVICES.CONTAINER))
|
||||||
task_work_list.append(QueryHypervisorTaskWork(
|
if host.host_service_configured(objects.HOST_SERVICES.COMPUTE):
|
||||||
self, host, force_pass=True))
|
task_work_list.append(QueryHypervisorTaskWork(
|
||||||
|
self, host, force_pass=True))
|
||||||
task_work_list.append(NotifyInstancesHostDisablingTaskWork(self, host))
|
task_work_list.append(NotifyInstancesHostDisablingTaskWork(self, host))
|
||||||
if host.host_service_configured(objects.HOST_SERVICES.COMPUTE):
|
if host.host_service_configured(objects.HOST_SERVICES.COMPUTE):
|
||||||
task_work_list.append(NotifyHostDisabledTaskWork(
|
task_work_list.append(NotifyHostDisabledTaskWork(
|
||||||
@ -248,8 +250,9 @@ class DisableHostTask(state_machine.StateTask):
|
|||||||
task_work_list.append(NotifyInstancesHostDisabledTaskWork(self, host))
|
task_work_list.append(NotifyInstancesHostDisabledTaskWork(self, host))
|
||||||
task_work_list.append(notify_host_services_task(
|
task_work_list.append(notify_host_services_task(
|
||||||
self, host, force_pass=True))
|
self, host, force_pass=True))
|
||||||
task_work_list.append(QueryHypervisorTaskWork(
|
if host.host_service_configured(objects.HOST_SERVICES.COMPUTE):
|
||||||
self, host, force_pass=True))
|
task_work_list.append(QueryHypervisorTaskWork(
|
||||||
|
self, host, force_pass=True))
|
||||||
super(DisableHostTask, self).__init__(
|
super(DisableHostTask, self).__init__(
|
||||||
'disable-host_%s' % host.name, task_work_list)
|
'disable-host_%s' % host.name, task_work_list)
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user