Move *Image parameters into role templates

We've got some inconsistent naming here, but I'm not attempting to
fix that yet, only move the current parameters inside each role template.

This should be backwards compatible because the parameter names
don't change, but also enable progress on custom-roles.  We can
figure out a strategy for deprecating these and aligning per-role
parameter naming in a subsequent patch.

Also moves ImageUpdatePolicy, which wasn't consistently passed to
all roles anyway, and aligns the default image and constraints
for each role.

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

1 files changed, 3 insertions, 4 deletions

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index f4cbbf31..4f2971bc 100644
--- a/puppet/compute.yaml
+++ b/puppet/compute.yaml
@@ -48,9 +48,9 @@ parameters:
   GlanceHost:
     type: string
     default: ''  # Has to be here because of the ignored empty value bug
-  Image:
+  NovaImage:
     type: string
-    default: overcloud-compute
+    default: overcloud-full
     constraints:
       - custom_constraint: glance.image
   ImageUpdatePolicy:
@@ -228,8 +228,7 @@ resources:
       os-collect-config:
         command: {get_param: ConfigCommand}
     properties:
-      image:
-        {get_param: Image}
+      image: {get_param: NovaImage}
       image_update_policy:
         get_param: ImageUpdatePolicy
       flavor: {get_param: Flavor}