← Back to branch summary

~hopem/charms/trusty/neutron-openvswitch/lp1500386

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2015-07-29 10:51:24 UTC
  • Revision ID: liam.young@canonical.com-20150729105124-vge529m3pf0r2ynt
[gnuoy,trivial] Pre-release charmhelper sync

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):