From 6098f54722d849d1635436272a87146a273531ec Mon Sep 17 00:00:00 2001
From: Lajos Katona <lajos.katona@ericsson.com>
Date: Tue, 22 Jan 2019 09:42:51 +0100
Subject: [PATCH] Add lock_path in installation guide

Oslo_concurrency needs lock_path option, make it consistent in
documentation for Suse, Redhat and Ubuntu installation guides.

Change-Id: Ib675d7bf399f2aa7eba9d343fa0f06281d33089a
Related-Bug: #1796976
Closes-Bug: #1812497
(cherry picked from commit 534e85039271d91647173527cd4c4905b9532537)
(cherry picked from commit 573b0be3e86905853b104647ff237fae191eed0b)
(cherry picked from commit de9f813928d11b9048d0201caa3cbff60ccbf37b)
---
 doc/source/install/compute-install-obs.rst           | 12 ++++++++++++
 .../install/controller-install-option1-obs.rst       | 12 ++++++++++++
 .../install/controller-install-option1-ubuntu.rst    | 12 ++++++++++++
 .../install/controller-install-option2-obs.rst       | 12 ++++++++++++
 .../install/controller-install-option2-ubuntu.rst    | 12 ++++++++++++
 5 files changed, 60 insertions(+)

diff --git a/doc/source/install/compute-install-obs.rst b/doc/source/install/compute-install-obs.rst
index 5ed39b3252b..1f3fbc89550 100644
--- a/doc/source/install/compute-install-obs.rst
+++ b/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
 ----------------------------
diff --git a/doc/source/install/controller-install-option1-obs.rst b/doc/source/install/controller-install-option1-obs.rst
index a630a11e651..10392aeb0b3 100644
--- a/doc/source/install/controller-install-option1-obs.rst
+++ b/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
 -------------------------------------------
 
diff --git a/doc/source/install/controller-install-option1-ubuntu.rst b/doc/source/install/controller-install-option1-ubuntu.rst
index 938b50083b0..1d96ceebb8c 100644
--- a/doc/source/install/controller-install-option1-ubuntu.rst
+++ b/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
 -------------------------------------------
 
diff --git a/doc/source/install/controller-install-option2-obs.rst b/doc/source/install/controller-install-option2-obs.rst
index 8bf6745c268..ff9f4b61e28 100644
--- a/doc/source/install/controller-install-option2-obs.rst
+++ b/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
 -------------------------------------------
 
diff --git a/doc/source/install/controller-install-option2-ubuntu.rst b/doc/source/install/controller-install-option2-ubuntu.rst
index 71d228d5676..9f23e88312f 100644
--- a/doc/source/install/controller-install-option2-ubuntu.rst
+++ b/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
 -------------------------------------------