openstack/ironic
Code Issues Proposed changes

Merge "Change 'decom' to clean/cleaning"

Browse Source
This commit is contained in:
Jenkins
2016-10-16 16:29:52 +00:00
committed by Gerrit Code Review
parent 36db05e239 e4b08df514
commit 47df7d2cdf
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
install-guide/source/get_started.rst
View File

@@ -34,7 +34,7 @@ ironic-api
ironic-conductor ironic-conductor
Adds/edits/deletes nodes; powers on/off nodes with ipmi or ssh; Adds/edits/deletes nodes; powers on/off nodes with ipmi or ssh;
provisions/deploys/decommissions bare metal nodes. provisions/deploys/cleans bare metal nodes.
ironic-python-agent ironic-python-agent
A python service which is run in a temporary ramdisk to provide A python service which is run in a temporary ramdisk to provide

2
ironic/drivers/modules/agent_base_vendor.py
View File

@@ -737,7 +737,7 @@ class BaseAgentVendor(AgentDeployMixin, base.VendorInterface):
"""Find a matching node for the agent. """Find a matching node for the agent.
Method to be called the first time a ramdisk agent checks in. This Method to be called the first time a ramdisk agent checks in. This
can be because this is a node just entering decom or a node that can be because this is a node just entering cleaning or a node that
rebooted for some reason. We will use the mac addresses listed in the rebooted for some reason. We will use the mac addresses listed in the
kwargs to find the matching node, then return the node object to the kwargs to find the matching node, then return the node object to the
agent. The agent can that use that UUID to use the node vendor agent. The agent can that use that UUID to use the node vendor