From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 31 Oct 2014 15:42:22 +0000 (+0000)
Subject: Merge "Use parameter constraints for image, key and flavor"
X-Git-Tag: opnfv-6.0.0~2726
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=897c8b8aa9295b0214f35bd08ac42416078904f5;p=apex-tripleo-heat-templates.git

Merge "Use parameter constraints for image, key and flavor"
---

897c8b8aa9295b0214f35bd08ac42416078904f5
diff --cc overcloud-without-mergepy.yaml
index 4df8587d,bba63f5e..e171ff82
--- a/overcloud-without-mergepy.yaml
+++ b/overcloud-without-mergepy.yaml
@@@ -397,30 -405,9 +405,32 @@@ parameters
      description: Use this flavor
      type: string
      default: baremetal
+     constraints:
+       - custom_constraint: nova.flavor
  
 +# Block storage specific parameters
 +  BlockStorageCount:
 +    type: number
 +    default: 1
 +  BlockStorageImage:
 +    default: overcloud-cinder-volume
 +    type: string
 +  OvercloudBlockStorageFlavor:
 +    default: baremetal
 +    description: Flavor for block storage nodes to request when deploying.
 +    type: string
 +
 +# Object storage specific parameters
 +  ObjectStorageCount:
 +    type: number
 +    default: 0
 +  OvercloudSwiftStorageFlavor:
 +    default: baremetal
 +    description: Flavor for Swift storage nodes to request when deploying.
 +    type: string
 +  SwiftStorageImage:
 +    default: overcloud-swift-storage
 +    type: string
  
  resources: