← Back to branch summary

~corey.bryant/charms/trusty/ceilometer-agent/tox

« back to all changes in this revision

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

  • Committer: Corey Bryant
  • Date: 2015-08-18 17:34:33 UTC
  • Revision ID: corey.bryant@canonical.com-20150818173433-pb3hzxevq5sxauzo
[corey.bryant,r=trivial] Sync charm-helpers to pick up Liberty support.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/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
81
81
                      'ceph-osd', 'ceph-radosgw']
82
82
        # Most OpenStack subordinate charms do not expose an origin option
83
83
        # as that is controlled by the principle.
84
 
        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch']
 
84
        ignore = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe']
85
85
 
86
86
        if self.openstack:
87
87
            for svc in services: