Merge "Add lock_path in installation guide" into stable/pike

doc/source/install/compute-install-obs.rst

@@ -79,6 +79,18 @@ authentication mechanism, message queue, and plug-in.
        ``[keystone_authtoken]`` section.
 
 
+* In the ``[oslo_concurrency]`` section, configure the lock path:
+
+  .. path /etc/neutron/neutron.conf
+  .. code-block:: ini
+
+     [oslo_concurrency]
+     # ...
+     lock_path = /var/lib/neutron/tmp
+
+  .. end
+
+
 
 Configure networking options
 ----------------------------

doc/source/install/controller-install-option1-obs.rst

@@ -134,6 +134,18 @@ and plug-in.
     Replace ``NOVA_PASS`` with the password you chose for the ``nova``
     user in the Identity service.
 
+
+* In the ``[oslo_concurrency]`` section, configure the lock path:
+
+  .. path /etc/neutron/neutron.conf
+  .. code-block:: ini
+
+     [oslo_concurrency]
+     # ...
+     lock_path = /var/lib/neutron/tmp
+
+  .. end
+
 Configure the Modular Layer 2 (ML2) plug-in
 -------------------------------------------
 

doc/source/install/controller-install-option1-ubuntu.rst

@@ -133,6 +133,18 @@ and plug-in.
     Replace ``NOVA_PASS`` with the password you chose for the ``nova``
     user in the Identity service.
 
+
+* In the ``[oslo_concurrency]`` section, configure the lock path:
+
+  .. path /etc/neutron/neutron.conf
+  .. code-block:: ini
+
+     [oslo_concurrency]
+     # ...
+     lock_path = /var/lib/neutron/tmp
+
+  .. end
+
 Configure the Modular Layer 2 (ML2) plug-in
 -------------------------------------------
 

doc/source/install/controller-install-option2-obs.rst

@@ -133,6 +133,18 @@ Configure the server component
     Replace ``NOVA_PASS`` with the password you chose for the ``nova``
     user in the Identity service.
 
+
+* In the ``[oslo_concurrency]`` section, configure the lock path:
+
+  .. path /etc/neutron/neutron.conf
+  .. code-block:: ini
+
+     [oslo_concurrency]
+     # ...
+     lock_path = /var/lib/neutron/tmp
+
+  .. end
+
 Configure the Modular Layer 2 (ML2) plug-in
 -------------------------------------------
 

doc/source/install/controller-install-option2-ubuntu.rst

@@ -132,6 +132,18 @@ Configure the server component
     Replace ``NOVA_PASS`` with the password you chose for the ``nova``
     user in the Identity service.
 
+
+* In the ``[oslo_concurrency]`` section, configure the lock path:
+
+  .. path /etc/neutron/neutron.conf
+  .. code-block:: ini
+
+     [oslo_concurrency]
+     # ...
+     lock_path = /var/lib/neutron/tmp
+
+  .. end
+
 Configure the Modular Layer 2 (ML2) plug-in
 -------------------------------------------