Charm Helpers

Merge lp:~cory-benfield/charm-helpers/trunk into lp:charm-helpers

  1. trunk
  2. Merge into devel
Proposed by Cory Benfield on 2015-04-23
Status: Merged
Merged at revision: 386
Proposed branch: lp:~cory-benfield/charm-helpers/trunk
Merge into: lp:charm-helpers
Diff against target: 24 lines (+6/-4)
1 file modified
charmhelpers/contrib/openstack/neutron.py (+6/-4)
To merge this branch: bzr merge lp:~cory-benfield/charm-helpers/trunk
Reviewer Review Type Date Requested Status
James Page 2015-04-23 Approve on 2015-06-10
Corey Bryant (community) Approve on 2015-05-27
Review via email: mp+257260@code.launchpad.net

Description of the Change

This change reflects Project Calico's new architecture: in particular, that we now deploy etcd across the data center, including as etcd proxies on nodes that host Calico code.

To post a comment you must log in.
Corey Bryant (corey.bryant) wrote :

Looks good to me.

review: Approve
James Page (james-page) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'charmhelpers/contrib/openstack/neutron.py'
2--- charmhelpers/contrib/openstack/neutron.py 2015-04-13 07:40:54 +0000
3+++ charmhelpers/contrib/openstack/neutron.py 2015-04-23 14:03:00 +0000
4@@ -172,14 +172,16 @@
5 'services': ['calico-felix',
6 'bird',
7 'neutron-dhcp-agent',
8- 'nova-api-metadata'],
9+ 'nova-api-metadata',
10+ 'etcd'],
11 'packages': [[headers_package()] + determine_dkms_package(),
12 ['calico-compute',
13 'bird',
14 'neutron-dhcp-agent',
15- 'nova-api-metadata']],
16- 'server_packages': ['neutron-server', 'calico-control'],
17- 'server_services': ['neutron-server']
18+ 'nova-api-metadata',
19+ 'etcd']],
20+ 'server_packages': ['neutron-server', 'calico-control', 'etcd'],
21+ 'server_services': ['neutron-server', 'etcd']
22 },
23 'vsp': {
24 'config': '/etc/neutron/plugins/nuage/nuage_plugin.ini',

Subscribers

People subscribed via source and target branches