diff options
| -rw-r--r-- | doc/source/deploy/user-guide.rst | 4 | ||||
| -rw-r--r-- | doc/source/drivers/amt.rst | 11 | ||||
| -rw-r--r-- | ironic/tests/drivers/test_seamicro.py | 3 |
3 files changed, 14 insertions, 4 deletions
diff --git a/doc/source/deploy/user-guide.rst b/doc/source/deploy/user-guide.rst index 59d290a4e..89d0fd272 100644 --- a/doc/source/deploy/user-guide.rst +++ b/doc/source/deploy/user-guide.rst @@ -47,8 +47,8 @@ Conceptual Architecture ======================= The following diagram shows the relationships and how all services come into -play during the provisioning of a physical server. (Note that Swift can be -used with Ironic, but is missing from this diagram.) +play during the provisioning of a physical server. (Note that Ceilometer and +Swift can be used with Ironic, but are missing from this diagram.) .. figure:: ../images/conceptual_architecture.png diff --git a/doc/source/drivers/amt.rst b/doc/source/drivers/amt.rst index 33e9701ac..ef6701a83 100644 --- a/doc/source/drivers/amt.rst +++ b/doc/source/drivers/amt.rst @@ -76,3 +76,14 @@ A detailed reference is available here, and a short guide follows below: ``amt_address``, and ``amt_username`` * Boot an instance + +.. note:: + It is recommended that nodes using the pxe_amt driver be deployed with the + `local boot`_ option. This is because the AMT firmware currently has no + support for setting a persistent boot device. Nodes deployed without the + `local boot`_ option could fail to boot if they are restarted outside of + Ironic's control (I.E. rebooted by a local user) because the node will + not attempt to PXE / network boot the kernel, using `local boot`_ solves this + known issue. + +.. _`local boot`: http://docs.openstack.org/developer/ironic/deploy/install-guide.html#local-boot-with-partition-images diff --git a/ironic/tests/drivers/test_seamicro.py b/ironic/tests/drivers/test_seamicro.py index ad4586828..e477cddd4 100644 --- a/ironic/tests/drivers/test_seamicro.py +++ b/ironic/tests/drivers/test_seamicro.py @@ -129,6 +129,7 @@ class SeaMicroValidateParametersTestCase(db_base.DbTestCase): node) +@mock.patch('eventlet.greenthread.sleep', lambda n: None) class SeaMicroPrivateMethodsTestCase(db_base.DbTestCase): def setUp(self): @@ -144,8 +145,6 @@ class SeaMicroPrivateMethodsTestCase(db_base.DbTestCase): self.config(action_timeout=0, group='seamicro') self.config(max_retry=2, group='seamicro') - self.patcher = mock.patch('eventlet.greenthread.sleep') - self.mock_sleep = self.patcher.start() self.info = seamicro._parse_driver_info(self.node) @mock.patch.object(seamicro_client, "Client") |