Skip to content

Commit 2e10d7b

Browse files
Fix doc warnings
Per Doug's email[0], 'warnerrors' in setup.cfg hasn't actually been working for some time now, and we've piled up a few warnings. Fix these before a pbr release to unbreak it gets pushed out and breaks our doc builds. [0] http://lists.openstack.org/pipermail/openstack-dev/2016-June/097849.html Change-Id: I6576a56234918febb21e7e4860544eb952123c09
1 parent b139dcc commit 2e10d7b

File tree

4 files changed

+21
-13
lines changed

4 files changed

+21
-13
lines changed

doc/source/index.rst

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,13 @@ provisioning servers.
1212
Throughout the remainder of the document, Ironic Python Agent will be
1313
abbreviated to IPA.
1414

15+
Index
16+
=====
17+
18+
.. toctree::
19+
20+
troubleshooting
21+
1522
How it works
1623
============
1724

@@ -350,4 +357,3 @@ Indices and tables
350357
* :ref:`genindex`
351358
* :ref:`modindex`
352359
* :ref:`search`
353-
* :ref:`troubleshooting`

ironic_python_agent/extensions/iscsi.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ def start_iscsi_target(self, iqn=None, wipe_disk_metadata=False,
151151
"""Expose the disk as an ISCSI target.
152152
153153
:param wipe_disk_metadata: if the disk metadata should be wiped out
154-
before the disk is exposed.
154+
before the disk is exposed.
155155
"""
156156
# If iqn is not given, generate one
157157
if iqn is None:

ironic_python_agent/hardware.py

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -354,12 +354,14 @@ def get_clean_steps(self, node, ports):
354354
355355
If multiple hardware managers return the same step name, the following
356356
logic will be used to determine which manager's step "wins":
357-
- Keep the step that belongs to HardwareManager with highest
358-
HardwareSupport (larger int) value.
359-
- If equal support level, keep the step with the higher defined
360-
priority (larger int).
361-
- If equal support level and priority, keep the step associated
362-
with the HardwareManager whose name comes earlier in the alphabet.
357+
358+
* Keep the step that belongs to HardwareManager with highest
359+
HardwareSupport (larger int) value.
360+
* If equal support level, keep the step with the higher defined
361+
priority (larger int).
362+
* If equal support level and priority, keep the step associated
363+
with the HardwareManager whose name comes earlier in the
364+
alphabet.
363365
364366
The steps will be called using `hardware.dispatch_to_managers` and
365367
handled by the best suited hardware manager. If you need a step to be

ironic_python_agent/tests/functional/base.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -71,13 +71,13 @@ def request(self, method, path, expect_error=None, expect_json=True,
7171
**kwargs):
7272
"""Send a request to the agent and verifies response.
7373
74-
:param: method type of request to send as a string
75-
:param: path desired API endpoint to request, for example 'commands'
76-
:param: expect_error error code to expect, if an error is expected
77-
:param: expect_json whether to expect a JSON response. if True, convert
74+
:param method: type of request to send as a string
75+
:param path: desired API endpoint to request, for example 'commands'
76+
:param expect_error: error code to expect, if an error is expected
77+
:param expect_json: whether to expect a JSON response. if True, convert
7878
it to a dict before returning, otherwise return the
7979
Response object
80-
:param **kwargs: keyword args to pass to the request method
80+
:param kwargs: keyword args to pass to the request method
8181
:raises: HTTPError if an error is returned that was not expected
8282
:raises: AssertionError if a received HTTP status code does not match
8383
expect_error

0 commit comments

Comments
 (0)