X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fcompute.yaml;h=1ae55cd351c5ac5c1d4e4be1ff7e4c9d98f87919;hb=0caf0a0b714e4477594119a5d281b7041d89486e;hp=f4cbbf3164cbcf126ea9b6099f8b2d6aa888bc4c;hpb=a45ea6107df25f1444142a1945717c90180e2700;p=apex-tripleo-heat-templates.git

diff --git a/puppet/compute.yaml b/puppet/compute.yaml
index f4cbbf31..1ae55cd3 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}
@@ -371,7 +370,6 @@ resources:
             - ceph
             - all_nodes # provided by allNodesConfig
             - '"%{::osfamily}"'
-            - common
             - network
             - neutron_bigswitch_data # Optionally provided by ComputeExtraConfigPre
             - cisco_n1kv_data  # Optionally provided by ComputeExtraConfigPre
@@ -389,8 +387,6 @@ resources:
               mapped_data: {get_param: NovaComputeExtraConfig}
             extraconfig:
               mapped_data: {get_param: ExtraConfig}
-            common:
-              raw_data: {get_file: hieradata/common.yaml}
             network:
               mapped_data:
                 net_ip_map: {get_attr: [NetIpMap, net_ip_map]}