← Back to branch summary

~1chb1n/charms/trusty/glance/next-amulet-update

« back to all changes in this revision

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

  • Committer: Billy Olsen
  • Date: 2015-06-22 17:03:00 UTC
  • mfrom: (119.1.1 glance)
  • Revision ID: billy.olsen@canonical.com-20150622170300-iqeusmtudt8v20bz
[corey.bryant,r=billy-olsen] Fix global requirements for git-deploy.

Show diffs side-by-side

added added

removed removed

Lines of Context:
hooks/charmhelpers/contrib/openstack/neutron.py
172
172
            'services': ['calico-felix',
173
173
                         'bird',
174
174
                         'neutron-dhcp-agent',
175
 
                         'nova-api-metadata'],
 
175
                         'nova-api-metadata',
 
176
                         'etcd'],
176
177
            'packages': [[headers_package()] + determine_dkms_package(),
177
178
                         ['calico-compute',
178
179
                          'bird',
179
180
                          'neutron-dhcp-agent',
180
 
                          'nova-api-metadata']],
181
 
            'server_packages': ['neutron-server', 'calico-control'],
182
 
            'server_services': ['neutron-server']
 
181
                          'nova-api-metadata',
 
182
                          'etcd']],
 
183
            'server_packages': ['neutron-server', 'calico-control', 'etcd'],
 
184
            'server_services': ['neutron-server', 'etcd']
183
185
        },
184
186
        'vsp': {
185
187
            'config': '/etc/neutron/plugins/nuage/nuage_plugin.ini',