← Back to branch summary

~landscape/charms/trusty/neutron-api-leadership-election/trunk

« back to all changes in this revision

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

  • Committer: james.page at ubuntu
  • Date: 2014-12-15 09:14:03 UTC
  • mfrom: (63.1.8 neutron-api)
  • Revision ID: james.page@ubuntu.com-20141215091403-af7ic1lxnnjsh4zu
[corey.bryant,r=james-page] Sort out charmhelpers issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/templating.py
1
1
import os
2
2
 
 
3
import six
 
4
 
3
5
from charmhelpers.fetch import apt_install
4
 
 
5
6
from charmhelpers.core.hookenv import (
6
7
    log,
7
8
    ERROR,
8
9
    INFO
9
10
)
10
 
 
11
11
from charmhelpers.contrib.openstack.utils import OPENSTACK_CODENAMES
12
12
 
13
13
try:
43
43
        order by OpenStack release.
44
44
    """
45
45
    tmpl_dirs = [(rel, os.path.join(templates_dir, rel))
46
 
                 for rel in OPENSTACK_CODENAMES.itervalues()]
 
46
                 for rel in six.itervalues(OPENSTACK_CODENAMES)]
47
47
 
48
48
    if not os.path.isdir(templates_dir):
49
49
        log('Templates directory not found @ %s.' % templates_dir,
258
258
        """
259
259
        Write out all registered config files.
260
260
        """
261
 
        [self.write(k) for k in self.templates.iterkeys()]
 
261
        [self.write(k) for k in six.iterkeys(self.templates)]
262
262
 
263
263
    def set_release(self, openstack_release):
264
264
        """
275
275
        '''
276
276
        interfaces = []
277
277
        [interfaces.extend(i.complete_contexts())
278
 
         for i in self.templates.itervalues()]
 
278
         for i in six.itervalues(self.templates)]
279
279
        return interfaces