Add SwiftMountCheck to overcloud-without-mergepy

This was added in I36fece56bafa9fe9c4883b572687b3fc819eeae1
and is missing from overcloud-without-mergepy.

Change-Id: I5c2566cc77247574f8d687eaab8094de481a8c67

diff --git a/controller.yaml b/controller.yaml
index 214ffbb..3d767c5 100644 (file)
--- a/controller.yaml
+++ b/controller.yaml
@@ -344,6 +344,10 @@ parameters:
       in the ring.
     hidden: true
     type: string
+  SwiftMountCheck:
+    default: 'false'
+    description: Value of mount_check in Swift account/container/object -server.conf
+    type: boolean
   SwiftMinPartHours:
     type: number
     default: 1
@@ -623,6 +627,7 @@ resources:
         swift:
           hash: { get_input: swift_hash_suffix }
           part-power: { get_input: swift_part_power }
+          mount-check: { get_input: swift_mount_check }
           min-part-hours: { get_input: swift_min_part_hours }
           replicas: {get_input: swift_replicas }
           service-password: { get_input: swift_password }
@@ -635,6 +640,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_min_part_hours: {get_param: SwiftMinPartHours}
         swift_part_power: {get_param: SwiftPartPower}

diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml
index 1ad3287..dd7fbb4 100644 (file)
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@ -370,6 +370,10 @@ parameters:
     description: The password for the swift service account, used by the swift proxy services.
     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
@@ -529,6 +533,7 @@ resources:
           SSLKey: {get_param: SSLKey}
           SSLCACertificate: {get_param: SSLCACertificate}
           SwiftHashSuffix: {get_param: SwiftHashSuffix}
+          SwiftMountCheck: {get_param: SwiftMountCheck}
           SwiftMinPartHours: {get_param: SwiftMinPartHours}
           SwiftPartPower: {get_param: SwiftPartPower}
           SwiftPassword: {get_param: SwiftPassword}
@@ -616,6 +621,7 @@ resources:
           NeutronNetworkType: {get_param: NeutronNetworkType}
           Flavor: {get_param: OvercloudSwiftStorageFlavor}
           HashSuffix: {get_param: SwiftHashSuffix}
+          MountCheck: {get_param: SwiftMountCheck}
           MinPartHours: {get_param: SwiftMinPartHours}
           PartPower: {get_param: SwiftPartPower}
           Password: {get_param: SwiftPassword}

diff --git a/swift-storage.yaml b/swift-storage.yaml
index 7522083..38359ff 100644 (file)
--- a/swift-storage.yaml
+++ b/swift-storage.yaml
@@ -112,6 +112,7 @@ resources:
           hash: { get_input: swift_hash_suffix }
           part-power: { get_input: swift_part_power }
           min-part-hours: { get_input: swift_min_part_hours }
+          mount-check: { get_input: swift_mount_check }
           replicas: {get_input: swift_replicas }
           service-password: { get_input: swift_password }
         neutron: