diff options
| -rw-r--r-- | block-storage.yaml | 6 | ||||
| -rw-r--r-- | nova-compute-instance.yaml | 6 | ||||
| -rw-r--r-- | overcloud-source.yaml | 12 |
3 files changed, 16 insertions, 8 deletions
diff --git a/block-storage.yaml b/block-storage.yaml index ca56fcef..c801040f 100644 --- a/block-storage.yaml +++ b/block-storage.yaml @@ -11,6 +11,10 @@ Parameters: Type: String Default: "guest" NoEcho: true + OvercloudBlockStorageFlavor: + Default: baremetal + Description: Flavor for block storage nodes to request when deploying. + Type: String Resources: BlockStorageAccessPolicy: Type: OS::Heat::AccessPolicy @@ -31,7 +35,7 @@ Resources: Properties: image: {Ref: BlockStorageImage} - flavor: {Ref: Flavor} + flavor: {Ref: OvercloudBlockStorageFlavor} key_name: {Ref: KeyName} Metadata: os-collect-config: diff --git a/nova-compute-instance.yaml b/nova-compute-instance.yaml index 55665dce..d2ca90f5 100644 --- a/nova-compute-instance.yaml +++ b/nova-compute-instance.yaml @@ -10,7 +10,7 @@ Parameters: Description: Name of an existing EC2 KeyPair to enable SSH access to the instances Type: String Default: default - Flavor: + OvercloudComputeFlavor: Description: Use this flavor Type: String Default: baremetal @@ -108,7 +108,7 @@ Resources: Ref: ComputeUser NovaCompute0CompletionCondition: Type: AWS::CloudFormation::WaitCondition - DependsOn: notCompute0 + DependsOn: notCompute0Config Properties: Handle: {Ref: NovaCompute0CompletionHandle} Count: '1' @@ -122,7 +122,7 @@ Resources: {Ref: NovaImage} image_update_policy: Ref: ImageUpdatePolicy - flavor: {Ref: Flavor} + flavor: {Ref: OvercloudComputeFlavor} key_name: {Ref: KeyName} Metadata: os-collect-config: diff --git a/overcloud-source.yaml b/overcloud-source.yaml index d9a7b7a4..d3604646 100644 --- a/overcloud-source.yaml +++ b/overcloud-source.yaml @@ -17,9 +17,13 @@ Parameters: Description: The password for the cinder service account, used by cinder-api. Type: String NoEcho: true - Flavor: + OvercloudControlFlavor: Default: baremetal - Description: Flavor to request when deploying. + Description: Flavor for control nodes to request when deploying. + Type: String + OvercloudComputeFlavor: + Default: baremetal + Description: Flavor for compute nodes to request when deploying. Type: String GlancePassword: Default: unset @@ -152,7 +156,7 @@ Resources: Type: AWS::IAM::AccessKey notCompute0CompletionCondition: Type: AWS::CloudFormation::WaitCondition - DependsOn: notCompute0 + DependsOn: notCompute0Config Properties: Handle: {Ref: notCompute0CompletionHandle} Count: '1' @@ -458,7 +462,7 @@ Resources: image_update_policy: Ref: ImageUpdatePolicy flavor: - Ref: Flavor + Ref: OvercloudControlFlavor key_name: Ref: KeyName Metadata: |