← Back to branch summary

~james-page/charms/trusty/glance/tox

« back to all changes in this revision

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

  • Committer: james.page at ubuntu
  • Date: 2015-07-07 14:02:07 UTC
  • mfrom: (121.1.5 glance)
  • Revision ID: james.page@ubuntu.com-20150707140207-k0wvswzi7qq6e94t
Update amulet tests for Kilo, prep for wily. Sync hooks/charmhelpers; Sync tests/charmhelpers.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/openstack/amulet/deployment.py
79
79
        services.append(this_service)
80
80
        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
81
81
                      'ceph-osd', 'ceph-radosgw']
82
 
        # Openstack subordinate charms do not expose an origin option as that
83
 
        # is controlled by the principle
84
 
        ignore = ['neutron-openvswitch']
 
82
        # Most OpenStack subordinate charms do not expose an origin option
 
83
        # as that is controlled by the principle.
 
84
        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch']
85
85
 
86
86
        if self.openstack:
87
87
            for svc in services:
148
148
            return os_origin.split('%s-' % self.series)[1].split('/')[0]
149
149
        else:
150
150
            return releases[self.series]
 
151
 
 
152
    def get_ceph_expected_pools(self, radosgw=False):
 
153
        """Return a list of expected ceph pools based on Ubuntu-OpenStack
 
154
        release and whether ceph radosgw is flagged as present or not."""
 
155
 
 
156
        if self._get_openstack_release() >= self.trusty_kilo:
 
157
            # Kilo or later
 
158
            pools = [
 
159
                'rbd',
 
160
                'cinder',
 
161
                'glance'
 
162
            ]
 
163
        else:
 
164
            # Juno or earlier
 
165
            pools = [
 
166
                'data',
 
167
                'metadata',
 
168
                'rbd',
 
169
                'cinder',
 
170
                'glance'
 
171
            ]
 
172
 
 
173
        if radosgw:
 
174
            pools.extend([
 
175
                '.rgw.root',
 
176
                '.rgw.control',
 
177
                '.rgw',
 
178
                '.rgw.gc',
 
179
                '.users.uid'
 
180
            ])
 
181
 
 
182
        return pools