Merge lp:~hopem/charms/trusty/neutron-gateway/lp1501323 into lp:~openstack-charmers-archive/charms/trusty/neutron-gateway/next

[Edward Hope-Morley]

Unmerged revisions

149. By Edward Hope-Morley on 2015-09-30

[hopem,r=]

Add support for enabling prefix delegation (>= Liberty)

Closes-Bug: 1501323

=== modified file 'config.yaml'
--- config.yaml	2015-09-24 16:22:09 +0000
+++ config.yaml	2015-09-30 12:52:21 +0000
@@ -176,6 +176,13 @@
       <physical_network> specifying physical_network names usable for VLAN
       provider and tenant networks, as well as ranges of VLAN tags on each
       available for allocation to tenant networks.
+  ipv6-prefix-delegation:
+    type: boolean
+    default: False
+    description: |
+       Prefix delegation was introduced in Openstack Liberty as a
+       means of supporting default subnet allocation for IPv6 tenant
+       networks. Set to True to enable.
   # Network configuration options
   # by default all access is over 'private-address'
   os-data-network:
 
=== modified file 'hooks/neutron_contexts.py'
--- hooks/neutron_contexts.py	2015-07-15 08:08:26 +0000
+++ hooks/neutron_contexts.py	2015-09-30 12:52:21 +0000
@@ -159,6 +159,9 @@
             ctxt['network_device_mtu'] = net_dev_mtu
             ctxt['veth_mtu'] = net_dev_mtu
 
+        if config('ipv6-prefix-delegation'):
+            ctxt['prefix_delegation'] = True
+
         return ctxt
 
 
 
=== added directory 'templates/liberty'
=== added file 'templates/liberty/neutron.conf'
--- templates/liberty/neutron.conf	1970-01-01 00:00:00 +0000
+++ templates/liberty/neutron.conf	2015-09-30 12:52:21 +0000
@@ -0,0 +1,28 @@
+# kilo
+###############################################################################
+# [ WARNING ]
+# Configuration file maintained by Juju. Local changes may be overwritten.
+###############################################################################
+[DEFAULT]
+verbose = {{ verbose }}
+debug = {{ debug }}
+core_plugin = {{ core_plugin }}
+control_exchange = neutron
+notification_driver = neutron.openstack.common.notifier.list_notifier
+list_notifier_drivers = neutron.openstack.common.notifier.rabbit_notifier
+{% if network_device_mtu -%}
+network_device_mtu = {{ network_device_mtu }}
+{% endif -%}
+{% if prefix_delegation -%}
+default_ipv6_subnet_pool = prefix_delegation
+{%- endif %}
+
+{% include "section-zeromq" %}
+
+[agent]
+root_helper = sudo /usr/bin/neutron-rootwrap /etc/neutron/rootwrap.conf
+
+{% include "section-rabbitmq-oslo" %}
+
+[oslo_concurrency]
+lock_path = /var/lock/neutron