From 3a0523a0f43eef7094c033d3f7b34b525c7d2525 Mon Sep 17 00:00:00 2001
From: wade-holler <wade.holler@ndatum.net>
Date: Mon, 16 May 2016 12:41:42 +0000
Subject: [PATCH] DOC: Change swift mountpoint to /srv/node

Background: Install Guide commands use
/srv/node mount point for /etc/fstab updates,
however example configuration settings for swift.yml
use /mnt. A new deployer, or one that doesn't
follow all of the instructions closely may use /mnt
for the configuration settings and /srv/node for
/etc/fstab updates. This results in an
unuseable swift subsystem.

Change: Update install guide docs, and swift.yml.example
to utilize /srv/node as the mount point example,
consistent with the install guide example /etc/fstab
updates.

Closes-Bug: 1582043

Change-Id: Ic64d36c7481fb4fdb6122d8578a0a6cf45e6b978
---
 doc/source/install-guide/configure-swift-config.rst  | 6 +++---
 doc/source/install-guide/configure-swift-devices.rst | 2 +-
 etc/openstack_deploy/conf.d/swift.yml.example        | 4 ++--
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/doc/source/install-guide/configure-swift-config.rst b/doc/source/install-guide/configure-swift-config.rst
index 73eaa0a0b8..c1635fa792 100644
--- a/doc/source/install-guide/configure-swift-config.rst
+++ b/doc/source/install-guide/configure-swift-config.rst
@@ -31,7 +31,7 @@ file**
        #       - name: sdd
        #       - name: sde
        #       - name: sdf
-       #     mount_point: /mnt
+       #     mount_point: /srv/node
        #     account:
        #     container:
        #     storage_policies:
@@ -109,8 +109,8 @@ file**
 
    ``mount_point``
        Set the ``mount_point`` value to the location where the swift
-       drives are mounted. For example, with a mount point of ``/mnt``
-       and a drive of ``sdc``, a drive is mounted at ``/mnt/sdc`` on the
+       drives are mounted. For example, with a mount point of ``/srv/node``
+       and a drive of ``sdc``, a drive is mounted at ``/srv/node/sdc`` on the
        ``swift_host``. This can be overridden on a per-host basis.
 
    ``storage_policies``
diff --git a/doc/source/install-guide/configure-swift-devices.rst b/doc/source/install-guide/configure-swift-devices.rst
index 188fb839b4..3486c10c59 100644
--- a/doc/source/install-guide/configure-swift-devices.rst
+++ b/doc/source/install-guide/configure-swift-devices.rst
@@ -97,7 +97,7 @@ The entry in the ``swift.yml``:
     #        - name: sde
     #        - name: sdf
     #        - name: sdg
-    #    mount_point: /mnt
+    #    mount_point: /srv/node
 
 --------------
 
diff --git a/etc/openstack_deploy/conf.d/swift.yml.example b/etc/openstack_deploy/conf.d/swift.yml.example
index 848e3e049b..e562f44c72 100644
--- a/etc/openstack_deploy/conf.d/swift.yml.example
+++ b/etc/openstack_deploy/conf.d/swift.yml.example
@@ -149,10 +149,10 @@
 #
 #     Example:
 #
-#     Mount disks 'sdc', 'sdd', 'sde', and 'sdf' to the '/mnt' directory on all
+#     Mount disks 'sdc', 'sdd', 'sde', and 'sdf' to the '/srv/node' directory on all
 #     storage hosts:
 #
-#     mount_point: /mnt
+#     mount_point: /srv/node
 #     drives:
 #       - name: sdc
 #       - name: sdd