← Back to branch summary

~ionutbalutoiu/charms/trusty/neutron-api/next

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/templating.py

  • Committer: David Ames
  • Date: 2015-08-05 18:02:32 UTC
  • mfrom: (131 trunk)
  • mto: This revision was merged to the branch mainline in revision 148.
  • Revision ID: david.ames@canonical.com-20150805180232-ra2lmzuglf6rxnej
Merge Upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/templating.py
29
29
try:
30
30
    from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
31
31
except ImportError:
32
 
    # python-jinja2 may not be installed yet, or we're running unittests.
33
 
    FileSystemLoader = ChoiceLoader = Environment = exceptions = None
 
32
    apt_install('python-jinja2', fatal=True)
 
33
    from jinja2 import FileSystemLoader, ChoiceLoader, Environment, exceptions
34
34
 
35
35
 
36
36
class OSConfigException(Exception):