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
---
 puppet/compute.yaml | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

(limited to 'puppet/compute.yaml')

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