]> review.fuel-infra Code Review - openstack-build/heat-build.git/commitdiff
Obey the passed in distro value in HAProxy template
authorZane Bitter <zbitter@redhat.com>
Mon, 15 Oct 2012 14:33:19 +0000 (16:33 +0200)
committerZane Bitter <zbitter@redhat.com>
Mon, 15 Oct 2012 15:32:53 +0000 (17:32 +0200)
Change-Id: I7e1dad654746329763bb575a09611aa0b827ec24
Signed-off-by: Zane Bitter <zbitter@redhat.com>
templates/HAProxy_Single_Instance.template

index 26143a25d54011be4d71c9b79edfdedf79dcdced..8b69eeb8e6fb92f260145c6f526e671f16b1084f 100644 (file)
         }
       },
       "Properties": {
-        "ImageId": "F16-x86_64-cfntools",
+        "ImageId" : {
+          "Fn::FindInMap" : [ "DistroArch2AMI",
+                              { "Ref" : "LinuxDistribution" },
+                              { "Fn::FindInMap" : [ "AWSInstanceType2Arch",
+                                                    { "Ref" : "InstanceType" },
+                                                    "Arch" ] } ]
+        },
         "InstanceType": { "Ref": "InstanceType" },
         "KeyName": { "Ref": "KeyName" },
         "UserData": { "Fn::Base64": { "Fn::Join": ["", [