← Back to branch summary

~openstack-charmers-next/charms/vivid/cisco-vpp/trunk

« back to all changes in this revision

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

  • Committer: Liam Young
  • Date: 2015-12-02 10:33:20 UTC
  • mfrom: (115.1.9 dhcp)
  • Revision ID: liam.young@canonical.com-20151202103320-0cjg1te17yovqyu3
[gnuoy, r=james-page] Adds support for serving dhcp and metadata requests to guests.

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/charmhelpers/contrib/openstack/amulet/deployment.py
44
44
           Determine if the local branch being tested is derived from its
45
45
           stable or next (dev) branch, and based on this, use the corresonding
46
46
           stable or next branches for the other_services."""
47
 
        base_charms = ['mysql', 'mongodb']
 
47
        base_charms = ['mysql', 'mongodb', 'nrpe']
48
48
 
49
49
        if self.series in ['precise', 'trusty']:
50
50
            base_series = self.series
83
83
        services.append(this_service)
84
84
        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
85
85
                      'ceph-osd', 'ceph-radosgw']
86
 
        # Openstack subordinate charms do not expose an origin option as that
87
 
        # is controlled by the principle
88
 
        ignore = ['neutron-openvswitch', 'cisco-vpp', 'odl-controller']
 
86
        # Most OpenStack subordinate charms do not expose an origin option
 
87
        # as that is controlled by the principle.
 
88
        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
 
89
                  'cisco-vpp', 'odl-controller']
89
90
 
90
91
        if self.openstack:
91
92
            for svc in services:
152
153
            return os_origin.split('%s-' % self.series)[1].split('/')[0]
153
154
        else:
154
155
            return releases[self.series]
 
156
 
 
157
    def get_ceph_expected_pools(self, radosgw=False):
 
158
        """Return a list of expected ceph pools in a ceph + cinder + glance
 
159
        test scenario, based on OpenStack release and whether ceph radosgw
 
160
        is flagged as present or not."""
 
161
 
 
162
        if self._get_openstack_release() >= self.trusty_kilo:
 
163
            # Kilo or later
 
164
            pools = [
 
165
                'rbd',
 
166
                'cinder',
 
167
                'glance'
 
168
            ]
 
169
        else:
 
170
            # Juno or earlier
 
171
            pools = [
 
172
                'data',
 
173
                'metadata',
 
174
                'rbd',
 
175
                'cinder',
 
176
                'glance'
 
177
            ]
 
178
 
 
179
        if radosgw:
 
180
            pools.extend([
 
181
                '.rgw.root',
 
182
                '.rgw.control',
 
183
                '.rgw',
 
184
                '.rgw.gc',
 
185
                '.users.uid'
 
186
            ])
 
187
 
 
188
        return pools