From 1c5a7c32835ca44934447b24cd6a5c542cb7b296 Mon Sep 17 00:00:00 2001
From: Steven Hardy <shardy@redhat.com>
Date: Tue, 26 Jul 2016 12:27:44 +0100
Subject: 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
---
 overcloud.yaml | 35 -----------------------------------
 1 file changed, 35 deletions(-)

(limited to 'overcloud.yaml')

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:
-- 
cgit 1.2.3-korg