openstack/ironic
Code Issues Proposed changes

Merge "Enable flake8 checking of ironic/nova/*"

Browse Source
This commit is contained in:
Jenkins 2015-06-18 18:19:47 +00:00 committed by Gerrit Code Review
commit b6e447a1aa
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
ironic/nova/compute/manager.py
View File

@ -23,12 +23,12 @@ work. The goal here is to generalise the areas where n-c talking to a clustered
hypervisor has issues, and long term fold them into the main ComputeManager. hypervisor has issues, and long term fold them into the main ComputeManager.
""" """
from oslo_concurrency import lockutils
from nova.compute import manager from nova.compute import manager
import nova.context import nova.context
from oslo_concurrency import lockutils
CCM_SEMAPHORE='clustered_compute_manager' CCM_SEMAPHORE = 'clustered_compute_manager'
class ClusteredComputeManager(manager.ComputeManager): class ClusteredComputeManager(manager.ComputeManager):
@ -48,22 +48,24 @@ class ClusteredComputeManager(manager.ComputeManager):
self.init_virt_events() self.init_virt_events()
# try: # try:
# evacuation is moot for a clustered hypervisor # evacuation is moot for a clustered hypervisor
# # checking that instance was not already evacuated to other host # # checking that instance was not already evacuated to other host
# self._destroy_evacuated_instances(context) # self._destroy_evacuated_instances(context)
# Don't run _init_instance until we solve the partitioning problem # Don't run _init_instance until we solve the partitioning problem
# - with N n-cpu's all claiming the same hostname, running # - with N n-cpu's all claiming the same hostname, running
# _init_instance here would lead to race conditions where each runs # _init_instance here would lead to race conditions where each runs
# _init_instance concurrently. # _init_instance concurrently.
# for instance in instances: # for instance in instances:
# self._init_instance(context, instance) # self._init_instance(context, instance)
# finally: # finally:
# defer_iptables_apply is moot for clusters - no local iptables # defer_iptables_apply is moot for clusters - no local iptables
# if CONF.defer_iptables_apply: # if CONF.defer_iptables_apply:
# self.driver.filter_defer_apply_off() # self.driver.filter_defer_apply_off()
def pre_start_hook(self): def pre_start_hook(self):
"""After the service is initialized, but before we fully bring """Update our available resources
After the service is initialized, but before we fully bring
the service up by listening on RPC queues, make sure to update the service up by listening on RPC queues, make sure to update
our available resources (and indirectly our available nodes). our available resources (and indirectly our available nodes).
""" """
@ -80,7 +82,9 @@ class ClusteredComputeManager(manager.ComputeManager):
@lockutils.synchronized(CCM_SEMAPHORE, 'ironic-') @lockutils.synchronized(CCM_SEMAPHORE, 'ironic-')
def _update_resources(self): def _update_resources(self):
"""Updates resources while protecting against a race on """Update our resources
Updates the resources while protecting against a race on
self._resource_tracker_dict. self._resource_tracker_dict.
""" """
self.update_available_resource(nova.context.get_admin_context()) self.update_available_resource(nova.context.get_admin_context())

2
tox.ini
View File

@ -74,7 +74,7 @@ commands = {posargs}
[flake8] [flake8]
# E711: ignored because it is normal to use "column == None" in sqlalchemy # E711: ignored because it is normal to use "column == None" in sqlalchemy
ignore = E129,E711 ignore = E129,E711
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools,*ironic/nova* exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools
max-complexity=17 max-complexity=17
[hacking] [hacking]