Removed MTU support from quantum - this option was only added in havana so will not take any effect in folsom and earlier

README.md

@@ -74,7 +74,8 @@ When using Open vSwitch plugin with GRE tunnels default MTU of 1500
 can cause problems due to GRE overhead. One solution is to increase 
 MTU on physical hosts and network equipment.
 When above solution is not possible or practical charm's instance-mtu
-option can be used to reduce instances MTU.
+option can be used to reduce instances MTU. Note that this option
+was added in havana and will be ignored in older releases.
 MTU value of 1400 is what OpenStack Open vSwitch documentatino suggests:
 [Openstack documentation](http://docs.openstack.org/admin-guide-cloud/content/openvswitch_plugin.html)
 

config.yaml

@@ -53,7 +53,8 @@ options:
   instance-mtu:
     type: int
     description: |
-      If set configures DHCP agent to provide MTU value to instances.
+      Only effective in havana. If set configures DHCP agent to provide
+      MTU value to instances.
       For example to set DHCP to provide MTU of 1400:
       1400 - set MTU on instances to 1400 bytes
       1520 - set MTU to 1520. Note that this might require similar

hooks/quantum_utils.py

@@ -135,7 +135,6 @@ TEMPLATES = 'templates'
 QUANTUM_CONF = "/etc/quantum/quantum.conf"
 QUANTUM_L3_AGENT_CONF = "/etc/quantum/l3_agent.ini"
 QUANTUM_DHCP_AGENT_CONF = "/etc/quantum/dhcp_agent.ini"
-QUANTUM_DNSMASQ_CONF = "/etc/quantum/dnsmasq.conf"
 QUANTUM_METADATA_AGENT_CONF = "/etc/quantum/metadata_agent.ini"
 
 NEUTRON_CONF = "/etc/neutron/neutron.conf"
@@ -161,10 +160,6 @@ QUANTUM_SHARED_CONFIG_FILES = {
         'hook_contexts': [QuantumGatewayContext()],
         'services': ['quantum-dhcp-agent']
     },
-    QUANTUM_DNSMASQ_CONF: {
-        'hook_contexts': [QuantumGatewayContext()],
-        'services': ['quantum-dhcp-agent']
-    },
     QUANTUM_METADATA_AGENT_CONF: {
         'hook_contexts': [NetworkServiceContext(),
                           QuantumGatewayContext()],