Merge "Move *Image parameters into role templates"

6 files changed, 19 insertions, 45 deletions

diff --git a/overcloud.yaml b/overcloud.yaml
index df3101c2..ab7a1f17 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -36,10 +36,6 @@ parameters:
     default: ''
     description: Set to True to enable debugging on all services.
     type: string
-  ImageUpdatePolicy:
-    default: 'REBUILD_PRESERVE_EPHEMERAL'
-    description: What policy to use when reconstructing instances. REBUILD for rebuilds, REBUILD_PRESERVE_EPHEMERAL to preserve /mnt.
-    type: string
   InternalApiVirtualFixedIPs:
     default: []
     description: >
@@ -128,11 +124,6 @@ parameters:
     description: |
       Deprecated. Use ControllerExtraConfig via parameter_defaults instead.
     type: json
-  controllerImage:
-    type: string
-    default: overcloud-full
-    constraints:
-      - custom_constraint: glance.image
   OvercloudControlFlavor:
     description: Flavor for control nodes to request when deploying.
     default: baremetal
@@ -187,11 +178,6 @@ parameters:
     default: false
     description: Whether to enable or not the Rbd backend for Nova
     type: boolean
-  NovaImage:
-    type: string
-    default: overcloud-full
-    constraints:
-      - custom_constraint: glance.image
   NovaOVSBridge:
     default: 'br-int'
     description: Name of integration bridge used by Open vSwitch
@@ -325,9 +311,6 @@ parameters:
   BlockStorageCount:
     type: number
     default: 0
-  BlockStorageImage:
-    default: overcloud-full
-    type: string
   OvercloudBlockStorageFlavor:
     description: Flavor for block storage nodes to request when deploying.
     default: baremetal
@@ -362,9 +345,6 @@ parameters:
     type: string
     constraints:
       - custom_constraint: nova.flavor
-  SwiftStorageImage:
-    default: overcloud-full
-    type: string
   ObjectStorageExtraConfig:
     default: {}
     description: |
@@ -390,9 +370,6 @@ parameters:
   CephStorageCount:
     type: number
     default: 0
-  CephStorageImage:
-    default: overcloud-full
-    type: string
   OvercloudCephStorageFlavor:
     default: baremetal
     description: Flavor for Ceph storage nodes to request when deploying.
@@ -553,7 +530,6 @@ resources:
           Flavor: {get_param: OvercloudControlFlavor}
           HeatAuthEncryptionKey: {get_resource: HeatAuthEncryptionKey}
           HorizonSecret: {get_resource: HorizonSecret}
-          Image: {get_param: controllerImage}
           MysqlClusterUniquePart: {get_attr: [MysqlClusterUniquePart, value]}
           MysqlRootPassword: {get_attr: [MysqlRootPassword, value]}
           PcsdPassword: {get_resource: PcsdPassword}
@@ -595,8 +571,6 @@ resources:
           ExtraConfig: {get_param: ExtraConfig}
           Flavor: {get_param: OvercloudComputeFlavor}
           GlanceHost: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, GlanceApiNetwork]}]}
-          Image: {get_param: NovaImage}
-          ImageUpdatePolicy: {get_param: ImageUpdatePolicy}
           KeystoneAdminApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystoneAdminApiNetwork]}]}
           KeystonePublicApiVirtualIP: {get_attr: [VipMap, net_ip_map, {get_param: [ServiceNetMap, KeystonePublicApiNetwork]}]}
           NeutronPassword: {get_param: NeutronPassword}
@@ -648,7 +622,6 @@ resources:
       resource_def:
         type: OS::TripleO::BlockStorage
         properties:
-          Image: {get_param: BlockStorageImage}
           Flavor: {get_param: OvercloudBlockStorageFlavor}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           Hostname:
@@ -682,7 +655,6 @@ resources:
         properties:
           Flavor: {get_param: OvercloudSwiftStorageFlavor}
           HashSuffix: {get_param: SwiftHashSuffix}
-          Image: {get_param: SwiftStorageImage}
           UpdateIdentifier: {get_param: UpdateIdentifier}
           ServiceNetMap: {get_param: ServiceNetMap}
           Hostname:
@@ -713,7 +685,6 @@ resources:
       resource_def:
         type: OS::TripleO::CephStorage
         properties:
-          Image: {get_param: CephStorageImage}
           Flavor: {get_param: OvercloudCephStorageFlavor}
           ServiceNetMap: {get_param: ServiceNetMap}
           UpdateIdentifier: {get_param: UpdateIdentifier}
diff --git a/puppet/ceph-storage.yaml b/puppet/ceph-storage.yaml
index 93c4a65b..4d489c82 100644
--- a/puppet/ceph-storage.yaml
+++ b/puppet/ceph-storage.yaml
@@ -6,9 +6,9 @@ parameters:
     type: string
     constraints:
       - custom_constraint: nova.flavor
-  Image:
+  CephStorageImage:
     type: string
-    default: overcloud-ceph-storage
+    default: overcloud-full
     constraints:
       - custom_constraint: glance.image
   ImageUpdatePolicy:
@@ -106,7 +106,7 @@ resources:
       os-collect-config:
         command: {get_param: ConfigCommand}
     properties:
-      image: {get_param: Image}
+      image: {get_param: CephStorageImage}
       image_update_policy: {get_param: ImageUpdatePolicy}
       flavor: {get_param: Flavor}
       key_name: {get_param: KeyName}
diff --git a/puppet/cinder-storage.yaml b/puppet/cinder-storage.yaml
index 995e19f7..fd6a4252 100644
--- a/puppet/cinder-storage.yaml
+++ b/puppet/cinder-storage.yaml
@@ -1,9 +1,11 @@
 heat_template_version: 2015-04-30
 description: 'OpenStack cinder storage configured by Puppet'
 parameters:
-  Image:
-    default: overcloud-cinder-volume
+  BlockStorageImage:
+    default: overcloud-full
     type: string
+    constraints:
+      - custom_constraint: glance.image
   ExtraConfig:
     default: {}
     description: |
@@ -107,7 +109,7 @@ resources:
         command: {get_param: ConfigCommand}
     properties:
       image:
-        {get_param: Image}
+        {get_param: BlockStorageImage}
       flavor: {get_param: Flavor}
       key_name: {get_param: KeyName}
       networks:
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}
diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 8013ecf4..cfde7e03 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -117,9 +117,9 @@ parameters:
     description: Secret key for Django
     type: string
     hidden: true
-  Image:
+  controllerImage:
     type: string
-    default: overcloud-control
+    default: overcloud-full
     constraints:
       - custom_constraint: glance.image
   ImageUpdatePolicy:
@@ -340,7 +340,7 @@ resources:
       os-collect-config:
         command: {get_param: ConfigCommand}
     properties:
-      image: {get_param: Image}
+      image: {get_param: controllerImage}
       image_update_policy: {get_param: ImageUpdatePolicy}
       flavor: {get_param: Flavor}
       key_name: {get_param: KeyName}
diff --git a/puppet/swift-storage.yaml b/puppet/swift-storage.yaml
index 00b81eb2..a0111bff 100644
--- a/puppet/swift-storage.yaml
+++ b/puppet/swift-storage.yaml
@@ -11,9 +11,11 @@ parameters:
       in the ring.
     hidden: true
     type: string
-  Image:
-    default: overcloud-swift-storage
+  SwiftStorageImage:
+    default: overcloud-full
     type: string
+    constraints:
+      - custom_constraint: glance.image
   KeyName:
     default: default
     description: Name of an existing Nova key pair to enable SSH access to the instances
@@ -112,7 +114,7 @@ resources:
       os-collect-config:
         command: {get_param: ConfigCommand}
     properties:
-      image: {get_param: Image}
+      image: {get_param: SwiftStorageImage}
       flavor: {get_param: Flavor}
       key_name: {get_param: KeyName}
       networks: