Merge 1f8dc90 into e7638c4

ministryofjustice · Feb 24, 2017 · 41836e1 · 41836e1
2 parents e7638c4 + 1f8dc90
commit 41836e1
Showing 1 changed file with 10 additions and 2 deletions.
diff --git a/bootstrap_cfn/config.py b/bootstrap_cfn/config.py
@@ -1084,10 +1084,18 @@ def _get_ssl_certificate(self, template, certificate_name):
             raise errors.CfnConfigError("Certificate name {} is invalid.".format(certificate_name))
 
         acm_certificate = self._get_acm_certificate(certificate_name)
+
         if acm_certificate:
             logging.info("config::_get_ssl_certificate: Found ACM certificate.")
-            template.add_resource(acm_certificate)
-            return Ref(acm_certificate)
+            #
+            # Try and reuse a certificate if it already exists in the tempalte
+            #
+            existing = template.resources.get(certificate_name)
+            if not existing:
+                template.add_resource(acm_certificate)
+                return Ref(acm_certificate)
+            else:
+                return Ref(existing)
 
         ssl_certificate = self._get_manual_ssl_certificate(certificate_name)
         if ssl_certificate: