← Back to branch summary

~openstack-charmers-next/charms/wily/heat/trunk

« back to all changes in this revision

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

  • Committer: Edward Hope-Morley
  • Date: 2016-02-18 13:47:28 UTC
  • mfrom: (68.1.9 trunk)
  • Revision ID: edward.hope-morley@canonical.com-20160218134728-8u8l51lv7y72iy2c
[hopem,r=jamespage]
 
Sync charmhelpers to get support for supplying a Ascii Armor PGP key to
openstack-origin (currently only supports Radix64)
Closes-Bug: 1518975

Show diffs side-by-side

added added

removed removed

Lines of Context:
tests/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
127
        no_origin = ['cinder-ceph', 'hacluster', 'neutron-openvswitch', 'nrpe',
128
 
                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller']
 
128
                     'openvswitch-odl', 'neutron-api-odl', 'odl-controller',
 
129
                     'cinder-backup']
129
130
 
130
131
        if self.openstack:
131
132
            for svc in services: