From: Zane Bitter <zbitter@redhat.com>
Date: Mon, 15 Oct 2012 14:33:19 +0000 (+0200)
Subject: Obey the passed in distro value in HAProxy template
X-Git-Tag: 2014.1~1308
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=ac38cae7f5352a0c2592d6789bdd5e35ca5aa900;p=openstack-build%2Fheat-build.git

Obey the passed in distro value in HAProxy template

Change-Id: I7e1dad654746329763bb575a09611aa0b827ec24
Signed-off-by: Zane Bitter <zbitter@redhat.com>
---

diff --git a/templates/HAProxy_Single_Instance.template b/templates/HAProxy_Single_Instance.template
index 26143a25..8b69eeb8 100644
--- a/templates/HAProxy_Single_Instance.template
+++ b/templates/HAProxy_Single_Instance.template
@@ -102,7 +102,13 @@
         }
       },
       "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": ["", [