← Back to branch summary

~openstack-charmers/charms/trusty/heat/next

« back to all changes in this revision

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

  • Committer: David Ames
  • Date: 2016-07-15 17:44:59 UTC
  • Revision ID: david.ames@canonical.com-20160715174459-3u28uzq23r40guji
Pre-release charm-helpers sync

To begin release testing get each charm up to date with lp:charm-helpers

Change-Id: I2d117aad4851fe355e8c808710d0d9a1e51b76ff

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/amulet/deployment.py
71
71
        base_charms = {
72
72
            'mysql': ['precise', 'trusty'],
73
73
            'mongodb': ['precise', 'trusty'],
74
 
            'nrpe': ['precise', 'trusty'],
 
74
            'nrpe': ['precise', 'trusty', 'wily', 'xenial'],
75
75
        }
76
76
 
77
77
        for svc in other_services:
112
112
 
113
113
        # Charms which should use the source config option
114
114
        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
115
 
                      'ceph-osd', 'ceph-radosgw', 'ceph-mon']
 
115
                      'ceph-osd', 'ceph-radosgw', 'ceph-mon', 'ceph-proxy']
116
116
 
117
117
        # Charms which can not use openstack-origin, ie. many subordinates
118
118
        no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',