update helpers.

hooks/charmhelpers/contrib/openstack/context.py

@@ -88,7 +88,7 @@ class SharedDBContext(OSContextGenerator):
                     'database_host': relation_get('db_host', rid=rid,
                                                   unit=unit),
                     'database': self.database,
-                    'database_user': self.username,
+                    'database_user': self.user,
                     'database_password': passwd,
                 }
         if not context_complete(ctxt):

hooks/charmhelpers/contrib/openstack/templating.py

@@ -11,10 +11,10 @@ from charmhelpers.core.hookenv import (
 from charmhelpers.contrib.openstack.utils import OPENSTACK_CODENAMES
 
 try:
-    from jinja2 import FileSystemLoader, ChoiceLoader, Environment
+    from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
 except ImportError:
     # python-jinja2 may not be installed yet, or we're running unittests.
-    FileSystemLoader = ChoiceLoader = Environment = None
+    FileSystemLoader = ChoiceLoader = Environment = exceptions = None
 
 
 class OSConfigException(Exception):
@@ -220,9 +220,17 @@ class OSConfigRenderer(object):
             log('Config not registered: %s' % config_file, level=ERROR)
             raise OSConfigException
         ctxt = self.templates[config_file].context()
+
         _tmpl = os.path.basename(config_file)
+        try:
+            template = self._get_template(_tmpl)
+        except exceptions.TemplateNotFound:
+            # if no template is found with basename, try looking for it
+            # using a munged full path, eg:
+            #   /etc/apache2/apache2.conf -> etc_apache2_apache2.conf
+            _tmpl = '_'.join(config_file.split('/')[1:])
+            template = self._get_template(_tmpl)
         log('Rendering from template: %s' % _tmpl, level=INFO)
-        template = self._get_template(_tmpl)
         return template.render(ctxt)
 
     def write(self, config_file):