Created by Cory Benfield on 2014-12-09 and last modified on 2016-03-03
Get this branch:
bzr branch lp:~project-calico/charms/trusty/neutron-calico/trunk
Members of Project Calico can upload to this branch. Log in for directions.

Branch merges

Related bugs

Related blueprints

Branch information

Project Calico

Recent revisions

68. By Neil Jerram on 2016-03-03

Changes for Calico networking with OpenStack Liberty

- Update Launchpad URLs for the neutron-calico charm.

- Fix 'seperate' typo.

- Update YAML description to say that we support Liberty.

- Add 2016 to copyright years.

- When running with Liberty, use Calico's DHCP agent, and stop and
  disable the Neutron DHCP agent.

- For Liberty and future OpenStack releases, use Calico's 'stable' PPA
  instead of a PPA named after the OpenStack release. (Because from
  Liberty onwards we do not need to patch Nova and Neutron.)

- Update maintainer from Cory Benfield to Neil Jerram.

- Provide empty dhcp_agent.ini config for Liberty, as the Calico DHCP
  agent does not need any config there.

67. By Neil Jerram on 2016-03-03

Sync with proposed Calico/Liberty charm-helpers code

This is the Calico/Liberty support that we have a current merge
proposal for at

"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'."

66. By Neil Jerram on 2016-03-03

Pull in latest lp:charm-helpers code

65. By Matt Dupre on 2016-01-11

Merge metadata fix into trunk

63. By Matt Dupre on 2015-10-12

Use openstack-origin option to default the calico-origin more sensibly

62. By Matt Dupre on 2015-10-12

Add openstack-origin config option

61. By Matt Dupre on 2015-09-17

Set metadata-shared-secret on neutron-plugin relation to keep nova-api-metadata installed

60. By Matt Dupre on 2015-08-28

Update charm names in README

59. By Matt Dupre on 2015-08-28

Further sync charmhelpers.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
This branch contains Public information 
Everyone can see this information.