← Back to branch summary

~corey.bryant/charms/trusty/openstack-dashboard/charm-proof-next

« back to all changes in this revision

Viewing changes to hooks/charmhelpers/contrib/openstack/neutron.py

  • Committer: Liam Young
  • Date: 2015-01-12 17:09:42 UTC
  • mfrom: (41.3.11 openstack-dashboard)
  • Revision ID: liam.young@canonical.com-20150112170942-kefvsi5zqijk0wiz
[gnuoy,r=james-page] Add support for nrpe

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
152
152
                                        database=config('neutron-database'),
153
153
                                        relation_prefix='neutron',
154
154
                                        ssl_dir=NEUTRON_CONF_DIR)],
155
 
            'services': ['calico-compute', 'bird', 'neutron-dhcp-agent'],
 
155
            'services': ['calico-felix',
 
156
                         'bird',
 
157
                         'neutron-dhcp-agent',
 
158
                         'nova-api-metadata'],
156
159
            'packages': [[headers_package()] + determine_dkms_package(),
157
 
                         ['calico-compute', 'bird', 'neutron-dhcp-agent']],
 
160
                         ['calico-compute',
 
161
                          'bird',
 
162
                          'neutron-dhcp-agent',
 
163
                          'nova-api-metadata']],
158
164
            'server_packages': ['neutron-server', 'calico-control'],
159
165
            'server_services': ['neutron-server']
160
166
        }