← Back to branch summary

~hopem/charms/trusty/keystone/reloads

« back to all changes in this revision

Viewing changes to tests/charmhelpers/contrib/amulet/deployment.py

  • Committer: james.page at ubuntu
  • Date: 2014-12-15 09:15:00 UTC
  • mfrom: (88.2.8 keystone)
  • Revision ID: james.page@ubuntu.com-20141215091500-774h7qn0fcnhuna3
[corey.bryant,r=james-page] Sort out charmhelpers issues.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/amulet/deployment.py
1
1
import amulet
2
 
 
3
2
import os
 
3
import six
4
4
 
5
5
 
6
6
class AmuletDeployment(object):
52
52
 
53
53
    def _add_relations(self, relations):
54
54
        """Add all of the relations for the services."""
55
 
        for k, v in relations.iteritems():
 
55
        for k, v in six.iteritems(relations):
56
56
            self.d.relate(k, v)
57
57
 
58
58
    def _configure_services(self, configs):
59
59
        """Configure all of the services."""
60
 
        for service, config in configs.iteritems():
 
60
        for service, config in six.iteritems(configs):
61
61
            self.d.configure(service, config)
62
62
 
63
63
    def _deploy(self):