← Back to branch summary

~charmers/charms/trusty/rabbitmq-server/trunk

« back to all changes in this revision

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

  • Committer: james.page at ubuntu
  • Date: 2015-03-26 13:07:43 UTC
  • mfrom: (82.2.3 rabbitmq-server)
  • Revision ID: james.page@ubuntu.com-20150326130743-opg59sdo60s2lx6j
Merge in trunk charm changes

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/amulet/deployment.py
71
71
        services.append(this_service)
72
72
        use_source = ['mysql', 'mongodb', 'rabbitmq-server', 'ceph',
73
73
                      'ceph-osd', 'ceph-radosgw']
 
74
        # Openstack subordinate charms do not expose an origin option as that
 
75
        # is controlled by the principle
 
76
        ignore = ['neutron-openvswitch']
74
77
 
75
78
        if self.openstack:
76
79
            for svc in services:
77
 
                if svc['name'] not in use_source:
 
80
                if svc['name'] not in use_source + ignore:
78
81
                    config = {'openstack-origin': self.openstack}
79
82
                    self.d.configure(svc['name'], config)
80
83
 
81
84
        if self.source:
82
85
            for svc in services:
83
 
                if svc['name'] in use_source:
 
86
                if svc['name'] in use_source and svc['name'] not in ignore:
84
87
                    config = {'source': self.source}
85
88
                    self.d.configure(svc['name'], config)
86
89