From 6f16c9638384ad2e2972b6b9cd2a3c6e72ef58bf Mon Sep 17 00:00:00 2001 From: Steve Kowalik Date: Thu, 27 Nov 2014 13:01:54 +1100 Subject: [PATCH] Remove default flavor from every template With the push to using the new setup-flavors provided by os-cloud-config, the default flavor will no longer be called 'baremetal', and Heat will always validate the default even if it is overridden. To that end, remove the default flavor from every flavor definition. Just to be certain, also add a custom_constraint to every flavor definition that was missing it. Change-Id: I24251e73be4e86738857f73b89499f592c4908de --- block-storage-nfs.yaml | 3 ++- block-storage.yaml | 3 ++- cinder-storage.yaml | 3 ++- compute.yaml | 1 - controller.yaml | 1 - nova-compute-instance.yaml | 3 ++- overcloud-source.yaml | 2 -- overcloud-without-mergepy.yaml | 8 ++++---- swift-storage-source.yaml | 3 ++- swift-storage.yaml | 3 ++- undercloud-source.yaml | 3 ++- 11 files changed, 18 insertions(+), 15 deletions(-) diff --git a/block-storage-nfs.yaml b/block-storage-nfs.yaml index 49473167b0..b87ef4e572 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 172944aab0..c288044adc 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 c80b777143..b4168586ae 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 57b3086868..e2340b835d 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 0c76f49646..6acf232f77 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 180657a6d4..6031fa5ddb 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -192,7 +192,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 c08dcbde6d..9fd455a044 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -346,13 +346,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 e171ff82ab..93ff78d0f5 100644 --- a/overcloud-without-mergepy.yaml +++ b/overcloud-without-mergepy.yaml @@ -190,7 +190,6 @@ parameters: constraints: - custom_constraint: glance.image OvercloudControlFlavor: - default: baremetal description: Flavor for control nodes to request when deploying. type: string constraints: @@ -404,7 +403,6 @@ parameters: OvercloudComputeFlavor: description: Use this flavor type: string - default: baremetal constraints: - custom_constraint: nova.flavor @@ -416,18 +414,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 10155df981..176925b6e4 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 2b40e80029..ea032b96a7 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 18527e53ba..0b1261464c 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