From b4f28d9a94874b2b4b492bd9f9611a76d404b9ad Mon Sep 17 00:00:00 2001
From: Matthew Kassawara <mkassawara@gmail.com>
Date: Fri, 17 Apr 2015 11:38:38 -0500
Subject: [PATCH] [install-guide] Specify lock_path option

The lock_path option moved from the [DEFAULT] section to
the [oslo_concurrency] section in several services. However,
some distributions did not update their configuration files
to reflect this change. In these cases, we must explicitly
add this option in the correct location to prevent
deprecation warnings.

Update this patch to address additional services with this
issue.

Change-Id: I208223e60dd86f9e4c753b52a2faaf240209b674
Implements: blueprint installguide-kilo
---
 doc/install-guide/section_cinder-controller-node.xml  | 7 +++++++
 doc/install-guide/section_cinder-storage-node.xml     | 7 +++++++
 doc/install-guide/section_nova-compute-install.xml    | 7 +++++++
 doc/install-guide/section_nova-controller-install.xml | 7 +++++++
 4 files changed, 28 insertions(+)

diff --git a/doc/install-guide/section_cinder-controller-node.xml b/doc/install-guide/section_cinder-controller-node.xml
index e1ca8f3700..613cd2dea9 100644
--- a/doc/install-guide/section_cinder-controller-node.xml
+++ b/doc/install-guide/section_cinder-controller-node.xml
@@ -172,6 +172,13 @@ admin_password = <replaceable>CINDER_PASS</replaceable></programlisting>
           <programlisting language="ini">[DEFAULT]
 ...
 my_ip = 10.0.0.11</programlisting>
+        </step>
+        <step>
+          <para>In the <literal>[oslo_concurrency]</literal> section,
+            configure the lock path:</para>
+          <programlisting language="ini">[oslo_concurrency]
+...
+lock_path = /var/lock/cinder</programlisting>
         </step>
         <step>
           <para>(Optional) To assist with troubleshooting,
diff --git a/doc/install-guide/section_cinder-storage-node.xml b/doc/install-guide/section_cinder-storage-node.xml
index c6095640b8..02feeac5a7 100644
--- a/doc/install-guide/section_cinder-storage-node.xml
+++ b/doc/install-guide/section_cinder-storage-node.xml
@@ -212,6 +212,13 @@ glance_host = <replaceable>controller</replaceable></programlisting>
           <programlisting language="ini">[DEFAULT]
 ...
 iscsi_helper = lioadm</programlisting>
+        </step>
+        <step>
+          <para>In the <literal>[oslo_concurrency]</literal> section,
+            configure the lock path:</para>
+          <programlisting language="ini">[oslo_concurrency]
+...
+lock_path = /var/lock/cinder</programlisting>
         </step>
         <step>
           <para>(Optional) To assist with troubleshooting,
diff --git a/doc/install-guide/section_nova-compute-install.xml b/doc/install-guide/section_nova-compute-install.xml
index 3c797bef8a..230e3e616b 100644
--- a/doc/install-guide/section_nova-compute-install.xml
+++ b/doc/install-guide/section_nova-compute-install.xml
@@ -145,6 +145,13 @@ novncproxy_base_url = http://<replaceable>controller</replaceable>:6080/vnc_auto
           <programlisting language="ini">[glance]
 ...
 host = <replaceable>controller</replaceable></programlisting>
+        </step>
+        <step>
+          <para>In the <literal>[oslo_concurrency]</literal> section,
+            configure the lock path:</para>
+          <programlisting language="ini">[oslo_concurrency]
+...
+lock_path = /var/lock/nova</programlisting>
         </step>
         <step>
           <para>(Optional) To assist with troubleshooting,
diff --git a/doc/install-guide/section_nova-controller-install.xml b/doc/install-guide/section_nova-controller-install.xml
index ce17bd4f81..93414c477f 100644
--- a/doc/install-guide/section_nova-controller-install.xml
+++ b/doc/install-guide/section_nova-controller-install.xml
@@ -211,6 +211,13 @@ vncserver_proxyclient_address = 10.0.0.11</programlisting>
           <programlisting language="ini">[glance]
 ...
 host = <replaceable>controller</replaceable></programlisting>
+        </step>
+        <step>
+          <para>In the <literal>[oslo_concurrency]</literal> section,
+            configure the lock path:</para>
+          <programlisting language="ini">[oslo_concurrency]
+...
+lock_path = /var/lock/nova</programlisting>
         </step>
         <step>
           <para>(Optional) To assist with troubleshooting,