summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLadislav Smola <lsmola@redhat.com>2014-02-24 10:04:52 -0500
committerLadislav Smola <lsmola@redhat.com>2014-02-25 04:27:15 -0500
commit9f4420800947b9f9860962edf9217934dc8012f3 (patch)
treebdb31229f6e69719b57ec3d39e2c38078da536a0
parentedf87127836805197d2d67c6c2addcdab60c1b7a (diff)
Different Flavors for Tuskar roles
- different Flavors for control, compute and storage nodes - for devtest use, they default to 'baremetal', so nothing changes - for Tuskar, there is a possibility to have them different for every role Change-Id: I8c1b80f55a91c7a7fd5e560ccdb8da82ec374084
-rw-r--r--block-storage.yaml6
-rw-r--r--nova-compute-instance.yaml4
-rw-r--r--overcloud-source.yaml10
3 files changed, 14 insertions, 6 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..2aca285b 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
@@ -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 6d21a4dc..712c7300 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
@@ -446,7 +450,7 @@ Resources:
image_update_policy:
Ref: ImageUpdatePolicy
flavor:
- Ref: Flavor
+ Ref: OvercloudControlFlavor
key_name:
Ref: KeyName
Metadata: