Puppet: overcloud compute config

[apex-tripleo-heat-templates.git] / swift-storage-source.yaml

diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml
index 103a7ec..176925b 100644 (file)
--- a/swift-storage-source.yaml
+++ b/swift-storage-source.yaml
@@ -1,17 +1,18 @@
 heat_template_version: 2013-05-23
 description: 'Common Swift Storage Configuration'
 parameters:
-  SwiftStorageImage:
+  OvercloudSwiftStorageFlavor:
+    description: Flavor for Swift storage nodes to request when deploying.
     type: string
-    default: overcloud-swift-storage
+    constraints:
+      - custom_constraint: nova.flavor
   SwiftReplicas:
     type: number
     default: 1
     description: How many replicas to use in the swift rings.
-  OvercloudSwiftStorageFlavor:
-    default: baremetal
-    description: Flavor for Swift storage nodes to request when deploying.
+  SwiftStorageImage:
     type: string
+    default: overcloud-swift-storage
 resources:
   SwiftStorage0:
     type: OS::Nova::Server
@@ -42,7 +43,9 @@ 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:
           Fn::Join:
           - ', '
@@ -71,3 +74,4 @@ resources:
                         - - {get_attr: [controller0, networks, ctlplane, 0]}
                           - ':11211'
         swift_replicas: { get_param: SwiftReplicas}
+        swift_min_part_hours: { get_param: SwiftMinPartHours}