From a714c0e80fac5f614614d26b0150edd7134c0b03 Mon Sep 17 00:00:00 2001
From: Andy McCrae <andy.mccrae@gmail.com>
Date: Wed, 12 Nov 2014 11:31:58 +0000
Subject: [PATCH] Allow a default mount_point to be specified

* Specify a default mount_point in global_overrides
* Can still be specified per node but not required.
* Allows this to be specified in one place only

Fixes #513
---
 etc/rpc_deploy/conf.d/swift.yml                               | 3 +++
 .../roles/swift_account/templates/account-server.conf.j2      | 2 +-
 .../roles/swift_container/templates/container-server.conf.j2  | 2 +-
 .../roles/swift_object/templates/object-server.conf.j2        | 2 +-
 rpc_deployment/roles/swift_storage_setup/tasks/main.yml       | 4 ++--
 5 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/etc/rpc_deploy/conf.d/swift.yml b/etc/rpc_deploy/conf.d/swift.yml
index 6f53897810..9b81944894 100644
--- a/etc/rpc_deploy/conf.d/swift.yml
+++ b/etc/rpc_deploy/conf.d/swift.yml
@@ -10,6 +10,8 @@
 # You can set one policy to be "default: yes" this will be the default storage policy for non-legacy containers that are created.
 # The index value must be unique.
 # Storage policies can be set to "deprecated: yes" which will mean they are not used
+# You can specify a default mount_point to avoid having to specify it for each node.
+# This can be overridden by specifying it for a specific node.
 # You can specify default drives in the global_overrides section, these drives will be used
 # if no other drives are specified per device. These work in the same way as the per node
 # drives, so the same settings can be used.
@@ -33,6 +35,7 @@
 #          index: 1
 #          repl_number: 2
 #          deprecated: yes
+#     mount_point: /mnt
 #     drives:
 #       - name: sdb
 #       - name: sdc
diff --git a/rpc_deployment/roles/swift_account/templates/account-server.conf.j2 b/rpc_deployment/roles/swift_account/templates/account-server.conf.j2
index 9631ded201..e286f581eb 100644
--- a/rpc_deployment/roles/swift_account/templates/account-server.conf.j2
+++ b/rpc_deployment/roles/swift_account/templates/account-server.conf.j2
@@ -5,7 +5,7 @@ bind_port = {{ swift_account_port }}
 # backlog = 4096
 user = {{ system_user }}
 # swift_dir = /etc/swift
-devices = {{ swift_vars.mount_point }}
+devices = {{ swift_vars.mount_point | default(swift.mount_point) }}
 # mount_check = true
 # disable_fallocate = false
 #
diff --git a/rpc_deployment/roles/swift_container/templates/container-server.conf.j2 b/rpc_deployment/roles/swift_container/templates/container-server.conf.j2
index aa9ea78459..d9f9453e80 100644
--- a/rpc_deployment/roles/swift_container/templates/container-server.conf.j2
+++ b/rpc_deployment/roles/swift_container/templates/container-server.conf.j2
@@ -5,7 +5,7 @@ bind_port = {{ swift_container_port }}
 # backlog = 4096
 user = {{ system_user }}
 # swift_dir = /etc/swift
-devices = {{ swift_vars.mount_point }}
+devices = {{ swift_vars.mount_point | default(swift.mount_point) }}
 # mount_check = true
 # disable_fallocate = false
 #
diff --git a/rpc_deployment/roles/swift_object/templates/object-server.conf.j2 b/rpc_deployment/roles/swift_object/templates/object-server.conf.j2
index 8fa1d6af30..ab7b196fac 100644
--- a/rpc_deployment/roles/swift_object/templates/object-server.conf.j2
+++ b/rpc_deployment/roles/swift_object/templates/object-server.conf.j2
@@ -5,7 +5,7 @@ bind_port = {{ swift_object_port }}
 # backlog = 4096
 user = {{ system_user }}
 swift_dir = /etc/swift
-devices = {{ swift_vars.mount_point }}
+devices = {{ swift_vars.mount_point | default(swift.mount_point) }}
 # mount_check = true
 # disable_fallocate = false
 # expiring_objects_container_divisor = 86400
diff --git a/rpc_deployment/roles/swift_storage_setup/tasks/main.yml b/rpc_deployment/roles/swift_storage_setup/tasks/main.yml
index 3e03558568..4722d8efce 100644
--- a/rpc_deployment/roles/swift_storage_setup/tasks/main.yml
+++ b/rpc_deployment/roles/swift_storage_setup/tasks/main.yml
@@ -15,7 +15,7 @@
 
 - name: "Set ownership on mounted drives"
   file:
-    dest: "{{ swift_vars.mount_point }}/{{ item.name }}"
+    dest: "{{ swift_vars.mount_point | default(swift.mount_point) }}/{{ item.name }}"
     owner: "{{ system_user }}"
     group: "{{ system_group }}"
     state: "directory"
@@ -24,7 +24,7 @@
 
 - name: "Set ownership on default mounted drives"
   file:
-    dest: "{{ swift_vars.mount_point }}/{{ item.name }}"
+    dest: "{{ swift_vars.mount_point | default(swift.mount_point) }}/{{ item.name }}"
     owner: "{{ system_user }}"
     group: "{{ system_group }}"
     state: "directory"