diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-05-31 21:02:47 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-05-31 21:02:47 +0000 |
commit | e664e2ff04c6f34aa71a2e584c6832647ed628ed (patch) | |
tree | f47cc28d0fae1ed2a538465ff7de837eb0ac45f2 | |
parent | ba0d79887bbe461858314090e68fab1661ffd5cb (diff) | |
parent | 10469bf39c374ef46c2df08c7ff150151b057463 (diff) | |
download | neutron-e664e2ff04c6f34aa71a2e584c6832647ed628ed.tar.gz |
Merge "Fixed docs job failure" into stable/ocata10.0.2
-rw-r--r-- | TESTING.rst | 2 | ||||
-rw-r--r-- | doc/source/devref/provisioning_blocks.rst | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/TESTING.rst b/TESTING.rst index e5c09282e3..408255bf04 100644 --- a/TESTING.rst +++ b/TESTING.rst @@ -605,6 +605,4 @@ TBD: how to do this with tox. References ~~~~~~~~~~ -.. [#pudb] PUDB debugger: - https://pypi.python.org/pypi/pudb .. _file-based-sqlite: http://lists.openstack.org/pipermail/openstack-dev/2016-July/099861.html diff --git a/doc/source/devref/provisioning_blocks.rst b/doc/source/devref/provisioning_blocks.rst index e5f764c05d..ed8ef8df79 100644 --- a/doc/source/devref/provisioning_blocks.rst +++ b/doc/source/devref/provisioning_blocks.rst @@ -32,8 +32,10 @@ When that entity has finishing provisioning, we just update the STATUS directly to active. However, there are resources in Neutron that require provisioning by multiple asynchronous entities before they are ready to be used so managing the transition to the ACTIVE status becomes more -complex. To handle these cases, Neutron has the provisioning_blocks -module to track the entities that are still provisioning a resource. +complex. To handle these cases, Neutron has `the provisioning_blocks +module +<http://git.openstack.org/cgit/openstack/neutron/tree/neutron/db/provisioning_blocks.py>`_ +to track the entities that are still provisioning a resource. The main example of this is with ML2, the L2 agents and the DHCP agents. When a port is created and bound to a host, it's placed in the DOWN @@ -151,9 +153,3 @@ the port is deleted or it is successful. If an ML2 driver immediately places a bound port in the ACTIVE state (e.g. after calling a backend in update_port_postcommit), this patch will not have any impact on that process. - - -References ----------- - -.. [#] Provisioning Blocks Module: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/db/provisioning_blocks.py |