Move *Flavor parameters into per-role templates

We have some inconsistent naming here, but move them with their
current names for backwards compatibility, we can address the
deprecation of the inconsistent names at a future time.

This is required to enable jinja templating of roles in overcloud.yaml

Change-Id: I2ea673d9bc52967f9b7c25555059b964abf66966
Partially-Implements: blueprint custom-roles

6 files changed, 14 insertions, 44 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index e8343ca4..e574362f 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -124,12 +124,6 @@ parameters:
     description: |
       Deprecated. Use ControllerExtraConfig via parameter_defaults instead.
     type: json
-  OvercloudControlFlavor:
-    description: Flavor for control nodes to request when deploying.
-    default: baremetal
-    type: string
-    constraints:
-      - custom_constraint: nova.flavor
   ExtraConfig:
     default: {}
     description: |
@@ -186,12 +180,6 @@ parameters:
     default: 'neutron'
     description: The full class name of the security API class
     type: string
-  OvercloudComputeFlavor:
-    description: Use this flavor
-    default: baremetal
-    type: string
-    constraints:
-      - custom_constraint: nova.flavor
   ServiceNetMap:
     default:
       NeutronTenantNetwork: tenant
@@ -307,12 +295,6 @@ parameters:
   BlockStorageCount:
     type: number
     default: 0
-  OvercloudBlockStorageFlavor:
-    description: Flavor for block storage nodes to request when deploying.
-    default: baremetal
-    type: string
-    constraints:
-      - custom_constraint: nova.flavor
   BlockStorageExtraConfig:
     default: {}
     description: |
@@ -335,12 +317,6 @@ parameters:
   ObjectStorageCount:
     type: number
     default: 0
-  OvercloudSwiftStorageFlavor:
-    description: Flavor for Swift storage nodes to request when deploying.
-    default: baremetal
-    type: string
-    constraints:
-      - custom_constraint: nova.flavor
   ObjectStorageExtraConfig:
     default: {}
     description: |
@@ -366,12 +342,6 @@ parameters:
   CephStorageCount:
     type: number
     default: 0
-  OvercloudCephStorageFlavor:
-    default: baremetal
-    description: Flavor for Ceph storage nodes to request when deploying.
-    type: string
-    constraints:
-      - custom_constraint: nova.flavor
   CephStorageExtraConfig:
     default: {}
     description: |
@@ -522,7 +492,6 @@ resources:
         type: OS::TripleO::Controller
         properties:
           controllerExtraConfig: {get_param: controllerExtraConfig}
-          Flavor: {get_param: OvercloudControlFlavor}
           HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
           HorizonSecret: {get_resource: HorizonSecret}
           MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]}
@@ -564,7 +533,6 @@ resources:
           CinderEnableRbdBackend: {get_param: CinderEnableRbdBackend}
           Debug: {get_param: Debug}
           ExtraConfig: {get_param: ExtraConfig}
-          Flavor: {get_param: OvercloudComputeFlavor}
           GlanceHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
           KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
           KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
@@ -617,7 +585,6 @@ resources:
       resource_def:
         type: OS::TripleO::BlockStorage
         properties:
-          Flavor: {get_param: OvercloudBlockStorageFlavor}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           Hostname:
             str_replace:
@@ -648,7 +615,6 @@ resources:
       resource_def:
         type: OS::TripleO::ObjectStorage
         properties:
-          Flavor: {get_param: OvercloudSwiftStorageFlavor}
           HashSuffix: {get_param: SwiftHashSuffix}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           ServiceNetMap: {get_param: ServiceNetMap}
@@ -680,7 +646,6 @@ resources:
       resource_def:
         type: OS::TripleO::CephStorage
         properties:
-          Flavor: {get_param: OvercloudCephStorageFlavor}
           ServiceNetMap: {get_param: ServiceNetMap}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           Hostname:
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 4d489c82..b5345d88 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -1,8 +1,9 @@
 heat_template_version: 2015-04-30
 description: 'OpenStack ceph storage node configured by Puppet'
 parameters:
-  Flavor:
+  OvercloudCephStorageFlavor:
     description: Flavor for the Ceph Storage node.
+    default: baremetal
     type: string
     constraints:
       - custom_constraint: nova.flavor
@@ -108,7 +109,7 @@ resources:
     properties:
       image: {get_param: CephStorageImage}
       image_update_policy: {get_param: ImageUpdatePolicy}
-      flavor: {get_param: Flavor}
+      flavor: {get_param: OvercloudCephStorageFlavor}
       key_name: {get_param: KeyName}
       networks:
         - network: ctlplane
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index fd6a4252..a9877f51 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -20,9 +20,10 @@ parameters:
   BlockStorageIPs:
     default: {}
     type: json
-  Flavor:
+  OvercloudBlockStorageFlavor:
     description: Flavor for block storage nodes to request when deploying.
     type: string
+    default: baremetal
     constraints:
       - custom_constraint: nova.flavor
   KeyName:
diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index 4f2971bc..ad95a5e8 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -40,8 +40,9 @@ parameters:
       Additional hiera configuration to inject into the cluster. Note
       that NovaComputeExtraConfig takes precedence over ExtraConfig.
     type: json
-  Flavor:
+  OvercloudComputeFlavor:
     description: Flavor for the nova compute node
+    default: baremetal
     type: string
     constraints:
       - custom_constraint: nova.flavor
@@ -231,7 +232,7 @@ resources:
       image: {get_param: NovaImage}
       image_update_policy:
         get_param: ImageUpdatePolicy
-      flavor: {get_param: Flavor}
+      flavor: {get_param: OvercloudComputeFlavor}
       key_name: {get_param: KeyName}
       networks:
         - network: ctlplane
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index dee27776..6ab9ceaf 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -93,8 +93,9 @@ parameters:
           ]
         }
     type: json
-  Flavor:
+  OvercloudControlFlavor:
     description: Flavor for control nodes to request when deploying.
+    default: baremetal
     type: string
     constraints:
       - custom_constraint: nova.flavor
@@ -342,7 +343,7 @@ resources:
     properties:
       image: {get_param: controllerImage}
       image_update_policy: {get_param: ImageUpdatePolicy}
-      flavor: {get_param: Flavor}
+      flavor: {get_param: OvercloudControlFlavor}
       key_name: {get_param: KeyName}
       networks:
         - network: ctlplane
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index a0111bff..3f8e1ce6 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -1,8 +1,9 @@
 heat_template_version: 2015-04-30
 description: 'OpenStack swift storage node configured by Puppet'
 parameters:
-  Flavor:
+  OvercloudSwiftStorageFlavor:
     description: Flavor for Swift storage nodes to request when deploying.
+    default: baremetal
     type: string
     constraints:
       - custom_constraint: nova.flavor
@@ -115,7 +116,7 @@ resources:
         command: {get_param: ConfigCommand}
     properties:
       image: {get_param: SwiftStorageImage}
-      flavor: {get_param: Flavor}
+      flavor: {get_param: OvercloudSwiftStorageFlavor}
       key_name: {get_param: KeyName}
       networks:
         - network: ctlplane