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

diff --cc compute.yaml
Simple merge

diff --cc controller.yaml
Simple merge

diff --cc overcloud-source.yaml
Simple merge

diff --cc overcloud-without-mergepy.yaml
index 4df8587,bba63f5..e171ff8
--- 1/overcloud-without-mergepy.yaml
--- 2/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: