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

[Ionut-Madalin Balutoiu]

Adds config option to provide additional config flags for the neutron dnsmasq.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #13163 neutron-gateway-next for ionutbalutoiu mp276833
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/13163/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #12315 neutron-gateway-next for ionutbalutoiu mp276833
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/12315/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #7769 neutron-gateway-next for ionutbalutoiu mp276833
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/7769/

[lp:~ionutbalutoiu/charms/trusty/neutron-gateway/next]

154. By Ionut-Madalin Balutoiu on 2015-11-17

Added config option for the additional dnsmasq flags

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #13922 neutron-gateway-next for ionutbalutoiu mp276833
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/13922/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #12979 neutron-gateway-next for ionutbalutoiu mp276833
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/12979/

=== modified file 'config.yaml'
--- config.yaml	2015-10-08 12:02:13 +0000
+++ config.yaml	2015-11-17 13:47:09 +0000
@@ -128,6 +128,12 @@
       within the cloud.  This is useful in deployments where its not
       possible to increase MTU on switches and physical servers to
       accommodate the packet overhead of using GRE tunnels.
+  dnsmasq-flags:
+    type: string
+    default:
+    description: |
+      Comma-separated list of key=value config flags with the additional
+      dhcp options for neutron dnsmasq.
   enable-l3-agent:
     type: boolean
     default: True
 
=== modified file 'hooks/neutron_contexts.py'
--- hooks/neutron_contexts.py	2015-10-08 19:12:34 +0000
+++ hooks/neutron_contexts.py	2015-11-17 13:47:09 +0000
@@ -13,6 +13,7 @@
 from charmhelpers.contrib.openstack.context import (
     OSContextGenerator,
     NeutronAPIContext,
+    config_flags_parser
 )
 from charmhelpers.contrib.openstack.utils import (
     get_os_codename_install_source
@@ -154,6 +155,10 @@
         if vlan_ranges:
             ctxt['vlan_ranges'] = ','.join(vlan_ranges.split())
 
+        dnsmasq_flags = config('dnsmasq-flags')
+        if dnsmasq_flags:
+            ctxt['dnsmasq_flags'] = config_flags_parser(dnsmasq_flags)
+
         net_dev_mtu = api_settings['network_device_mtu']
         if net_dev_mtu:
             ctxt['network_device_mtu'] = net_dev_mtu
 
=== modified file 'templates/havana/dnsmasq.conf'
--- templates/havana/dnsmasq.conf	2014-03-31 22:23:32 +0000
+++ templates/havana/dnsmasq.conf	2015-11-17 13:47:09 +0000
@@ -1,3 +1,8 @@
 {%- if instance_mtu -%}
 dhcp-option=26,{{ instance_mtu }}
 {% endif -%}
+{% if dnsmasq_flags -%}
+{% for key, value in dnsmasq_flags.iteritems() -%}
+{{ key }} = {{ value }}
+{% endfor -%}
+{% endif -%}
 
=== modified file 'unit_tests/test_neutron_contexts.py'
--- unit_tests/test_neutron_contexts.py	2015-05-07 09:33:38 +0000
+++ unit_tests/test_neutron_contexts.py	2015-11-17 13:47:09 +0000
@@ -17,6 +17,7 @@
     'eligible_leader',
     'get_os_codename_install_source',
     'unit_get',
+    'config_flags_parser'
 ]
 
 
@@ -123,6 +124,8 @@
         self.test_config.set('debug', False)
         self.test_config.set('verbose', True)
         self.test_config.set('instance-mtu', 1420)
+        self.test_config.set('dnsmasq-flags', 'dhcp-userclass=set:ipxe,iPXE,'
+                                              'dhcp-match=set:ipxe,175')
         self.test_config.set('vlan-ranges',
                              'physnet1:1000:2000 physnet2:2001:3000')
         self.test_config.set('flat-network-providers', 'physnet3 physnet4')
@@ -131,6 +134,10 @@
         _runits.return_value = ['neutron-api/0']
         _rget.side_effect = lambda *args, **kwargs: rdata
         self.get_os_codename_install_source.return_value = 'folsom'
+        self.config_flags_parser.return_value = {
+            'dhcp-userclass': 'set:ipxe,iPXE',
+            'dhcp-match': 'set:ipxe,175'
+        }
         _host_ip.return_value = '10.5.0.1'
         _secret.return_value = 'testsecret'
         ctxt = neutron_contexts.NeutronGatewayContext()()
@@ -152,6 +159,10 @@
             'vlan_ranges': 'physnet1:1000:2000,physnet2:2001:3000',
             'network_device_mtu': 9000,
             'veth_mtu': 9000,
+            'dnsmasq_flags': {
+                'dhcp-userclass': 'set:ipxe,iPXE',
+                'dhcp-match': 'set:ipxe,175'
+            }
         })