Merge lp:~project-calico/charm-helpers/liberty2 into lp:charm-helpers

[Nell Jerram]

Add support for Calico networking with OpenStack Liberty release.

Specifically, with Liberty we use a Calico-specific DHCP agent instead of the Neutron reference DHCP agent. Therefore we install an additional package, calico-dhcp-agent, and manage the 'calico-dhcp-agent' service instead of 'neutron-dhcp-agent'.

[Nell Jerram (neil-jerram)]

This merge request replaces https://code.launchpad.net/~project-calico/charm-helpers/liberty/+merge/287927, because that one had conflicts.

Unmerged revisions

539. By Nell Jerram on 2016-03-08

Changes for Calico networking with OpenStack Liberty

=== modified file 'charmhelpers/contrib/openstack/neutron.py'
--- charmhelpers/contrib/openstack/neutron.py	2016-03-01 20:08:54 +0000
+++ charmhelpers/contrib/openstack/neutron.py	2016-03-08 09:59:13 +0000
@@ -171,15 +171,13 @@
                                         ssl_dir=NEUTRON_CONF_DIR)],
             'services': ['calico-felix',
                          'bird',
-                         'neutron-dhcp-agent',
-                         'nova-api-metadata',
-                         'etcd'],
-            'packages': [determine_dkms_package(),
-                         ['calico-compute',
-                          'bird',
-                          'neutron-dhcp-agent',
-                          'nova-api-metadata',
-                          'etcd']],
+                         'calico-dhcp-agent',
+                         'nova-api-metadata',
+                         'etcd'],
+            'packages': ['calico-compute',
+                         'calico-dhcp-agent',
+                         'nova-api-metadata',
+                         'etcd'],
             'server_packages': ['neutron-server', 'calico-control', 'etcd'],
             'server_services': ['neutron-server', 'etcd']
         },
@@ -247,6 +245,14 @@
             'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2')
         plugins['plumgrid']['server_packages'].remove(
             'neutron-plugin-plumgrid')
+
+    # For Calico pre-Liberty, use Neutron DHCP agent instead of Calico DHCP
+    # agent.
+    if release < 'liberty':
+        plugins['Calico']['packages'].remove('calico-dhcp-agent')
+        plugins['Calico']['services'].remove('calico-dhcp-agent')
+        plugins['Calico']['services'].append('neutron-dhcp-agent')
+
     return plugins