summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2017-05-31 21:03:01 +0000
committerGerrit Code Review <review@openstack.org>2017-05-31 21:03:01 +0000
commit8fd2f2f64350bd048f717c5eb205be811ab08643 (patch)
tree505b04970d673102237198112d51a04b140f4fdf
parentd16074b0b545aeaf38216e54b074abb501c64868 (diff)
parent7c2e0514c9a1348fe00eb0979556f3518892ab50 (diff)
Merge "Fixed docs job failure" into stable/newton
-rw-r--r--TESTING.rst2
-rw-r--r--doc/source/devref/provisioning_blocks.rst12
2 files changed, 4 insertions, 10 deletions
diff --git a/TESTING.rst b/TESTING.rst
index 4568eaa..662b31c 100644
--- a/TESTING.rst
+++ b/TESTING.rst
@@ -679,6 +679,4 @@ with pdb::
679References 679References
680~~~~~~~~~~ 680~~~~~~~~~~
681 681
682.. [#pudb] PUDB debugger:
683 https://pypi.python.org/pypi/pudb
684.. _file-based-sqlite: http://lists.openstack.org/pipermail/openstack-dev/2016-July/099861.html 682.. _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 e5f764c..ed8ef8d 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
32directly to active. However, there are resources in Neutron that require 32directly to active. However, there are resources in Neutron that require
33provisioning by multiple asynchronous entities before they are ready to 33provisioning by multiple asynchronous entities before they are ready to
34be used so managing the transition to the ACTIVE status becomes more 34be used so managing the transition to the ACTIVE status becomes more
35complex. To handle these cases, Neutron has the provisioning_blocks 35complex. To handle these cases, Neutron has `the provisioning_blocks
36module to track the entities that are still provisioning a resource. 36module
37<http://git.openstack.org/cgit/openstack/neutron/tree/neutron/db/provisioning_blocks.py>`_
38to track the entities that are still provisioning a resource.
37 39
38The main example of this is with ML2, the L2 agents and the DHCP agents. 40The main example of this is with ML2, the L2 agents and the DHCP agents.
39When a port is created and bound to a host, it's placed in the DOWN 41When 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.
151If an ML2 driver immediately places a bound port in the ACTIVE state 153If an ML2 driver immediately places a bound port in the ACTIVE state
152(e.g. after calling a backend in update_port_postcommit), this patch 154(e.g. after calling a backend in update_port_postcommit), this patch
153will not have any impact on that process. 155will not have any impact on that process.
154
155
156References
157----------
158
159.. [#] Provisioning Blocks Module: http://git.openstack.org/cgit/openstack/neutron/tree/neutron/db/provisioning_blocks.py