From 33210832b5d3303405925cac58b8222f3f4b7ccd Mon Sep 17 00:00:00 2001
From: Steve Baker <sbaker@redhat.com>
Date: Thu, 21 Feb 2013 11:11:55 +1300
Subject: [PATCH] Sync with heat-jeos commit 13f183e

---
 heat_cfntools/cfntools/cfn_helper.py | 18 +++++++++++++-----
 1 file changed, 13 insertions(+), 5 deletions(-)

diff --git a/heat_cfntools/cfntools/cfn_helper.py b/heat_cfntools/cfntools/cfn_helper.py
index c466826..e56e1ae 100644
--- a/heat_cfntools/cfntools/cfn_helper.py
+++ b/heat_cfntools/cfntools/cfn_helper.py
@@ -816,19 +816,27 @@ class ConfigsetsHandler(object):
         return executionlist
 
 
-def metadata_server_port():
+def metadata_server_port(datafile='/var/lib/cloud/data/cfn-metadata-server'):
     """
     Return the the metadata server port
     reads the :NNNN from the end of the URL in cfn-metadata-server
     """
     try:
-        f = open("/var/lib/cloud/data/cfn-metadata-server")
+        f = open(datafile)
         server_url = f.read().strip()
         f.close()
-        if not server_url[-1] == '/':
-            server_url += '/'
+    except IOError:
+        return None
+
+    if len(server_url) < 1:
+        return None
+
+    if server_url[-1] == '/':
+        server_url = server_url[:-1]
+
+    try:
         return int(server_url.split(':')[-1])
-    except:
+    except ValueError:
         return None