diff options
| -rw-r--r-- | block-storage-nfs.yaml | 3 | ||||
| -rw-r--r-- | block-storage.yaml | 3 | ||||
| -rw-r--r-- | cinder-storage.yaml | 3 | ||||
| -rw-r--r-- | compute.yaml | 1 | ||||
| -rw-r--r-- | controller.yaml | 1 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 3 | ||||
| -rw-r--r-- | overcloud-source.yaml | 2 | ||||
| -rw-r--r-- | overcloud-without-mergepy.yaml | 8 | ||||
| -rw-r--r-- | swift-storage-source.yaml | 3 | ||||
| -rw-r--r-- | swift-storage.yaml | 3 | ||||
| -rw-r--r-- | undercloud-source.yaml | 3 |
11 files changed, 18 insertions, 15 deletions
diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml index 49473167..b87ef4e5 100644 --- a/block-storage-nfs.yaml +++ b/block-storage-nfs.yaml @@ -5,9 +5,10 @@ parameters: type: string default: overcloud-cinder-volume OvercloudBlockStorageFlavor: - default: baremetal description: Flavor for block storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor resources: BlockStorageAccessPolicy: type: OS::Heat::AccessPolicy diff --git a/block-storage.yaml b/block-storage.yaml index 172944aa..c288044a 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -5,9 +5,10 @@ parameters: type: string default: overcloud-cinder-volume OvercloudBlockStorageFlavor: - default: baremetal description: Flavor for block storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor BlockStorageExtraConfig: default: {} description: | diff --git a/cinder-storage.yaml b/cinder-storage.yaml index d7145010..b30dcdb6 100644 --- a/cinder-storage.yaml +++ b/cinder-storage.yaml @@ -62,9 +62,10 @@ parameters: } type: json Flavor: - default: baremetal description: Flavor for block storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor GlancePort: default: "9292" description: Glance port. diff --git a/compute.yaml b/compute.yaml index 45e1c87f..c93bd627 100644 --- a/compute.yaml +++ b/compute.yaml @@ -72,7 +72,6 @@ parameters: Flavor: description: Flavor for the nova compute node type: string - default: baremetal constraints: - custom_constraint: nova.flavor GlanceHost: diff --git a/controller.yaml b/controller.yaml index 359cbfc1..0e99cb04 100644 --- a/controller.yaml +++ b/controller.yaml @@ -94,7 +94,6 @@ parameters: } type: json Flavor: - default: baremetal description: Flavor for control nodes to request when deploying. type: string constraints: diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 1b73e812..2d8168a8 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -171,7 +171,8 @@ parameters: OvercloudComputeFlavor: description: Use this flavor type: string - default: baremetal + constraints: + - custom_constraint: nova.flavor RabbitHost: type: string RabbitUserName: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index 37de2835..5084e386 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -317,13 +317,11 @@ parameters: type: string default: '' OvercloudComputeFlavor: - default: baremetal description: Flavor for compute nodes to request when deploying. type: string constraints: - custom_constraint: nova.flavor OvercloudControlFlavor: - default: baremetal description: Flavor for control nodes to request when deploying. type: string constraints: 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 diff --git a/swift-storage-source.yaml b/swift-storage-source.yaml index 10155df9..176925b6 100644 --- a/swift-storage-source.yaml +++ b/swift-storage-source.yaml @@ -2,9 +2,10 @@ heat_template_version: 2013-05-23 description: 'Common Swift Storage Configuration' parameters: OvercloudSwiftStorageFlavor: - default: baremetal description: Flavor for Swift storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor SwiftReplicas: type: number default: 1 diff --git a/swift-storage.yaml b/swift-storage.yaml index 2b40e800..ea032b96 100644 --- a/swift-storage.yaml +++ b/swift-storage.yaml @@ -43,9 +43,10 @@ parameters: } type: json Flavor: - default: baremetal description: Flavor for Swift storage nodes to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor HashSuffix: default: unset description: A random string to be used as a salt when hashing to determine mappings diff --git a/undercloud-source.yaml b/undercloud-source.yaml index 18527e53..0b126146 100644 --- a/undercloud-source.yaml +++ b/undercloud-source.yaml @@ -74,9 +74,10 @@ parameters: } type: json Flavor: - default: baremetal description: Flavor to request when deploying. type: string + constraints: + - custom_constraint: nova.flavor GlanceLogFile: description: The filepath of the file to use for logging messages from Glance. type: string |