diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2014-12-09 21:34:15 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2014-12-09 21:34:15 +0000 |
| commit | f0ba1a632448fb50c0a8754f5d183c4d1f5759f4 (patch) | |
| tree | bfa5b8b880980eaf5d4193f442384004c549fc3a /overcloud-without-mergepy.yaml | |
| parent | 39c9406d456bdc755bfc6c2c8ddf94a05a33df12 (diff) | |
| parent | 6f16c9638384ad2e2972b6b9cd2a3c6e72ef58bf (diff) | |
Merge "Remove default flavor from every template"
Diffstat (limited to 'overcloud-without-mergepy.yaml')
| -rw-r--r-- | overcloud-without-mergepy.yaml | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/overcloud-without-mergepy.yaml b/overcloud-without-mergepy.yaml index c2891204..ae61ec4b 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -226,7 +226,6 @@ parameters: constraints: - custom_constraint: glance.image OvercloudControlFlavor: - default: baremetal description: Flavor for control nodes to request when deploying. type: string constraints: @@ -428,7 +427,6 @@ parameters: OvercloudComputeFlavor: description: Use this flavor type: string - default: baremetal constraints: - custom_constraint: nova.flavor @@ -440,18 +438,20 @@ parameters: default: overcloud-cinder-volume type: string OvercloudBlockStorageFlavor: - default: baremetal description: Flavor for block storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor # Object storage specific parameters ObjectStorageCount: type: number default: 0 OvercloudSwiftStorageFlavor: - default: baremetal description: Flavor for Swift storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor SwiftStorageImage: default: overcloud-swift-storage type: string |