← Back to branch summary

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

« back to all changes in this revision

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

  • Committer: David Ames
  • Date: 2015-09-28 17:45:40 UTC
  • mfrom: (145 trunk)
  • mto: This revision was merged to the branch mainline in revision 146.
  • Revision ID: david.ames@canonical.com-20150928174540-wx0t0d3uwgmlsotb
Pull in upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/amulet/deployment.py
51
51
        if 'units' not in this_service:
52
52
            this_service['units'] = 1
53
53
 
54
 
        self.d.add(this_service['name'], units=this_service['units'])
 
54
        self.d.add(this_service['name'], units=this_service['units'],
 
55
                   constraints=this_service.get('constraints'))
55
56
 
56
57
        for svc in other_services:
57
58
            if 'location' in svc:
64
65
            if 'units' not in svc:
65
66
                svc['units'] = 1
66
67
 
67
 
            self.d.add(svc['name'], charm=branch_location, units=svc['units'])
 
68
            self.d.add(svc['name'], charm=branch_location, units=svc['units'],
 
69
                       constraints=svc.get('constraints'))
68
70
 
69
71
    def _add_relations(self, relations):
70
72
        """Add all of the relations for the services."""