← Back to branch summary

~openstack-charmers-next/charms/wily/odl-controller/trunk

« back to all changes in this revision

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

  • Committer: Gerrit Code Review
  • Author(s): Jenkins
  • Date: 2016-03-18 16:10:08 UTC
  • mfrom: (21.1.1 trunk)
  • Revision ID: review@openstack.org-20160318161008-grzlrlzei667shdd
Merge "Add support for Ubuntu Xenial"

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/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
 
        no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe']
 
127
        no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
 
128
                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
 
129
                     'cinder-backup']
128
130
 
129
131
        if self.openstack:
130
132
            for svc in services:
224
226
         self.precise_havana, self.precise_icehouse,
225
227
         self.trusty_icehouse, self.trusty_juno, self.utopic_juno,
226
228
         self.trusty_kilo, self.vivid_kilo, self.trusty_liberty,
227
 
         self.wily_liberty) = range(12)
 
229
         self.wily_liberty, self.trusty_mitaka,
 
230
         self.xenial_mitaka) = range(14)
228
231
 
229
232
        releases = {
230
233
            ('precise', None): self.precise_essex,
236
239
            ('trusty', 'cloud:trusty-juno'): self.trusty_juno,
237
240
            ('trusty', 'cloud:trusty-kilo'): self.trusty_kilo,
238
241
            ('trusty', 'cloud:trusty-liberty'): self.trusty_liberty,
 
242
            ('trusty', 'cloud:trusty-mitaka'): self.trusty_mitaka,
239
243
            ('utopic', None): self.utopic_juno,
240
244
            ('vivid', None): self.vivid_kilo,
241
 
            ('wily', None): self.wily_liberty}
 
245
            ('wily', None): self.wily_liberty,
 
246
            ('xenial', None): self.xenial_mitaka}
242
247
        return releases[(self.series, self.openstack)]
243
248
 
244
249
    def _get_openstack_release_string(self):
255
260
            ('utopic', 'juno'),
256
261
            ('vivid', 'kilo'),
257
262
            ('wily', 'liberty'),
 
263
            ('xenial', 'mitaka'),
258
264
        ])
259
265
        if self.openstack:
260
266
            os_origin = self.openstack.split(':')[1]