← Back to branch summary

~openstack-charmers-archive/charms/trusty/swift-storage/next

« back to all changes in this revision

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

  • Committer: James Page
  • Date: 2016-01-30 12:37:50 UTC
  • mto: This revision was merged to the branch mainline in revision 104.
  • Revision ID: james.page@ubuntu.com-20160130123750-i9iu2d7yflp5br5f
Resync helpers, refactor code to use cpu calcs from charmhelpers

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/openstack/amulet/deployment.py
121
121
 
122
122
        # Charms which should use the source config option
123
123
        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
124
 
                      'ceph-osd', 'ceph-radosgw']
 
124
                      'ceph-osd', 'ceph-radosgw', 'ceph-mon']
125
125
 
126
126
        # Charms which can not use openstack-origin, ie. many subordinates
127
127
        no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
128
 
                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller']
 
128
                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
 
129
                     'cinder-backup']
129
130
 
130
131
        if self.openstack:
131
132
            for svc in services: