Merge pull request #1954 from lorin/ec2-facts-fix

If ec2 fact has ':' or '-', change to '_'

library/ec2_facts

@@ -96,12 +96,21 @@ class Ec2Metadata(object):
                 else:
                     self._data['%s' % (new_uri)] = content
 
+    def fix_invalid_varnames(self, data):
+        """Change ':'' and '-' to '_' to ensure valid template variable names"""
+        for (key, value) in data.items():
+            if ':' in key or '-' in key:
+                newkey = key.replace(':','_').replace('-','_')
+                data[newkey] = value
+
+
     def run(self):
         self.fetch(self.uri_meta) # populate _data
         data =  self._mangle_fields(self._data,
                                 self.uri_meta)
         data[self._prefix % 'user-data'] = self._fetch(self.uri_user)
         data[self._prefix % 'public-key'] = self._fetch(self.uri_ssh)
+        self.fix_invalid_varnames(data)
         return data