From c48c1761df45ae6ba2eb4ddf2c9d28412b384e3b Mon Sep 17 00:00:00 2001
From: Eamonn O'Toole <eamonn.otoole@hp.com>
Date: Wed, 22 Oct 2014 14:06:09 +0100
Subject: [PATCH] Add swift.mount-check metadata

We've submitted a patch (https://review.openstack.org/#/c/130172/)
to set the value of mount_check to swift.mount-check if it exists,
and otherwise to set mount_check to false.  By default TripleO
deployments set mount_check to false since they do not use mounted
disks to store data.  However we (HP) and others are now using
TripleO to deploy Swift servers with mounted drives for data, in
which case mount_check should be set to True.  This change adds
swift.mount-check data and sets it to the value of the
SwiftMountCheck parameter, which has a default value of False.

Change-Id: I36fece56bafa9fe9c4883b572687b3fc819eeae1
---
 swift-deploy.yaml         | 5 +++++
 swift-source.yaml         | 1 +
 swift-storage-source.yaml | 1 +
 swift-storage.yaml        | 5 +++++
 4 files changed, 12 insertions(+)

diff --git a/swift-deploy.yaml b/swift-deploy.yaml
index 9c42684a..1e15511f 100644
--- a/swift-deploy.yaml
+++ b/swift-deploy.yaml
@@ -5,6 +5,10 @@ parameters:
     description: A random string to be used as a salt when hashing to determine mappings in the ring.
     type: string
     hidden: true
+  SwiftMountCheck:
+    default: 'false'
+    description: Value of mount_check in Swift account/container/object -server.conf
+    type: boolean
   SwiftMinPartHours:
     type: number
     default: 1
@@ -31,6 +35,7 @@ resources:
       signal_transport: NO_SIGNAL
       input_values:
         swift_hash_suffix: {get_param: SwiftHashSuffix}
+        swift_mount_check: {get_param: SwiftMountCheck}
         swift_password: {get_param: SwiftPassword}
         swift_part_power: {get_param: SwiftPartPower}
         swift_devices:
diff --git a/swift-source.yaml b/swift-source.yaml
index 815ca7f5..e6fd951e 100644
--- a/swift-source.yaml
+++ b/swift-source.yaml
@@ -7,6 +7,7 @@ resources:
         swift:
           devices: { get_input: swift_devices }
           hash: { get_input: swift_hash_suffix }
+          mount-check: { get_input: swift_mount_check }
           part-power: { get_input: swift_part_power }
           proxy-memcache: { get_input: swift_proxy_memcache }
           replicas: {get_input: swift_replicas }
diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index fabb5545..10155df9 100644
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -42,6 +42,7 @@ resources:
       signal_transport: NO_SIGNAL
       input_values:
         swift_hash_suffix: {get_param: SwiftHashSuffix}
+        swift_mount_check: {get_param: SwiftMountCheck}
         swift_password: {get_param: SwiftPassword}
         swift_part_power: {get_param: SwiftPartPower}
         swift_devices:
diff --git a/swift-storage.yaml b/swift-storage.yaml
index 68fd8a48..2b40e800 100644
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -59,6 +59,10 @@ parameters:
     default: default
     description: Name of an existing EC2 KeyPair to enable SSH access to the instances
     type: string
+  MountCheck:
+    default: 'false'
+    description: Value of mount_check in Swift account/container/object -server.conf
+    type: boolean
   NeutronEnableTunnelling:
     default: "True"
     type: string
@@ -143,6 +147,7 @@ resources:
         snmpd_readonly_user_name: {get_param: SnmpdReadonlyUserName}
         snmpd_readonly_user_password: {get_param: SnmpdReadonlyUserPassword}
         swift_hash_suffix: {get_param: HashSuffix}
+        swift_mount_check: {get_param: MountCheck}
         swift_password: {get_param: Password}
         swift_part_power: {get_param: PartPower}
         swift_replicas: { get_param: Replicas}
-- 
2.16.6