Merge "Add swift.mount-check metadata"

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:

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 }

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:

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}