← Back to branch summary

~james-page/charms/trusty/neutron-api/calico-merge

~james-page/charms/trusty/neutron-api/calico-merge

Viewing all changes in revision 127.

Committer: james.page at ubuntu
Date: 2015-07-16 15:57:14 UTC
mfrom: (39.7.33 neutron-api)
Revision ID: james.page@ubuntu.com-20150716155714-jt1dog2l71sb5jm8

Merge Calico support from Cory Benfield.

Switch to using offical etcd-proxy relation.

files added:
hooks/etcd-peer-relation-broken

hooks/etcd-peer-relation-changed

hooks/etcd-peer-relation-departed

hooks/etcd-peer-relation-joined

templates/icehouse/etcd.conf

files modified:
config.yaml

hooks/neutron_api_context.py

hooks/neutron_api_hooks.py

hooks/neutron_api_utils.py

metadata.yaml

templates/icehouse/ml2_conf.ini

templates/icehouse/neutron.conf

templates/juno/neutron.conf

templates/kilo/ml2_conf.ini

templates/kilo/neutron.conf

unit_tests/test_neutron_api_context.py

unit_tests/test_neutron_api_hooks.py

unit_tests/test_neutron_api_utils.py

Show diffs side-by-side

added added

removed removed

hooks/etcd-peer-relation-broken@

hooks/etcd-peer-relation-changed@

hooks/etcd-peer-relation-departed@

hooks/etcd-peer-relation-joined@

hooks/neutron_api_context.py

hooks/neutron_api_hooks.py

hooks/neutron_api_utils.py

templates/icehouse/etcd.conf

templates/icehouse/ml2_conf.ini

templates/icehouse/neutron.conf

templates/juno/neutron.conf

templates/kilo/ml2_conf.ini

templates/kilo/neutron.conf

unit_tests/test_neutron_api_context.py

unit_tests/test_neutron_api_hooks.py

unit_tests/test_neutron_api_utils.py

Older »