diff options
Diffstat (limited to 'ironic/conductor')
| -rw-r--r-- | ironic/conductor/base_manager.py | 3 | ||||
| -rw-r--r-- | ironic/conductor/deployments.py | 4 | ||||
| -rw-r--r-- | ironic/conductor/manager.py | 10 | ||||
| -rw-r--r-- | ironic/conductor/rpcapi.py | 2 | ||||
| -rw-r--r-- | ironic/conductor/utils.py | 4 |
5 files changed, 12 insertions, 11 deletions
diff --git a/ironic/conductor/base_manager.py b/ironic/conductor/base_manager.py index 8ef568d83..c5c7d4b90 100644 --- a/ironic/conductor/base_manager.py +++ b/ironic/conductor/base_manager.py @@ -118,7 +118,8 @@ class BaseConductorManager(object): _check_enabled_interfaces() - # NOTE(deva): these calls may raise DriverLoadError or DriverNotFound + # NOTE(tenbrae): these calls may raise DriverLoadError or + # DriverNotFound # NOTE(vdrok): Instantiate network and storage interface factory on # startup so that all the interfaces are loaded at the very # beginning, and failures prevent the conductor from starting. diff --git a/ironic/conductor/deployments.py b/ironic/conductor/deployments.py index 26df423aa..152bbce43 100644 --- a/ironic/conductor/deployments.py +++ b/ironic/conductor/deployments.py @@ -281,8 +281,8 @@ def do_next_deploy_step(task, step_index, conductor_id): # Check if the step is done or not. The step should return # states.DEPLOYWAIT if the step is still being executed, or # None if the step is done. - # NOTE(deva): Some drivers may return states.DEPLOYWAIT - # eg. if they are waiting for a callback + # NOTE(tenbrae): Some drivers may return states.DEPLOYWAIT + # eg. if they are waiting for a callback if result == states.DEPLOYWAIT: # Kill this worker, the async step will make an RPC call to # continue_node_deploy() to continue deploying diff --git a/ironic/conductor/manager.py b/ironic/conductor/manager.py index 69756391e..4a588c874 100644 --- a/ironic/conductor/manager.py +++ b/ironic/conductor/manager.py @@ -1004,13 +1004,13 @@ class ConductorManager(base_manager.BaseConductorManager): node.last_error = _("Failed to tear down. Error: %s") % e task.process_event('error') else: - # NOTE(deva): When tear_down finishes, the deletion is done, + # NOTE(tenbrae): When tear_down finishes, the deletion is done, # cleaning will start next LOG.info('Successfully unprovisioned node %(node)s with ' 'instance %(instance)s.', {'node': node.uuid, 'instance': node.instance_uuid}) finally: - # NOTE(deva): there is no need to unset conductor_affinity + # NOTE(tenbrae): there is no need to unset conductor_affinity # because it is a reference to the most recent conductor which # deployed a node, and does not limit any future actions. # But we do need to clear the instance-related fields. @@ -1463,7 +1463,7 @@ class ConductorManager(base_manager.BaseConductorManager): with task_manager.acquire(context, node_uuid, purpose='power state sync', shared=True) as task: - # NOTE(deva): we should not acquire a lock on a node in + # NOTE(tenbrae): we should not acquire a lock on a node in # DEPLOYWAIT/CLEANWAIT, as this could cause # an error within a deploy ramdisk POSTing back # at the same time. @@ -1883,7 +1883,7 @@ class ConductorManager(base_manager.BaseConductorManager): try: with task_manager.acquire(context, node_uuid, purpose='node take over') as task: - # NOTE(deva): now that we have the lock, check again to + # NOTE(tenbrae): now that we have the lock, check again to # avoid racing with deletes and other state changes node = task.node if (node.maintenance @@ -2235,7 +2235,7 @@ class ConductorManager(base_manager.BaseConductorManager): try: if enabled: task.driver.console.start_console(task) - # TODO(deva): We should be updating conductor_affinity here + # TODO(tenbrae): We should be updating conductor_affinity here # but there is no support for console sessions in # take_over() right now. else: diff --git a/ironic/conductor/rpcapi.py b/ironic/conductor/rpcapi.py index f3a64824b..4b1929b02 100644 --- a/ironic/conductor/rpcapi.py +++ b/ironic/conductor/rpcapi.py @@ -132,7 +132,7 @@ class ConductorAPI(object): serializer=serializer) use_groups = self.client.can_send_version('1.47') - # NOTE(deva): this is going to be buggy + # NOTE(tenbrae): this is going to be buggy self.ring_manager = hash_ring.HashRingManager(use_groups=use_groups) def get_conductor_for(self, node): diff --git a/ironic/conductor/utils.py b/ironic/conductor/utils.py index e537219c6..ca399b651 100644 --- a/ironic/conductor/utils.py +++ b/ironic/conductor/utils.py @@ -369,7 +369,7 @@ def provisioning_error_handler(e, node, provision_state, """ if isinstance(e, exception.NoFreeConductorWorker): - # NOTE(deva): there is no need to clear conductor_affinity + # NOTE(tenbrae): there is no need to clear conductor_affinity # because it isn't updated on a failed deploy node.provision_state = provision_state node.target_provision_state = target_provision_state @@ -499,7 +499,7 @@ def deploying_error_handler(task, logmsg, errmsg=None, traceback=False, node.last_error = cleanup_err node.save() - # NOTE(deva): there is no need to clear conductor_affinity + # NOTE(tenbrae): there is no need to clear conductor_affinity task.process_event('fail') |