Merge "Allow dnsmasq configuration to be overriden"

defaults/main.yml

@@ -90,6 +90,14 @@ neutron_dns_domain: "openstacklocal."
 # neutron_api_threads in templates/dhcp_agent.ini.j2 for num_sync_threads.
 # neutron_num_sync_threads: 4
 
+###
+### DNSMasq configuration
+###
+# Dnsmasq doesn't work with config_template override, a deployer
+# should instead configure its own neutron_dhcp_config key/values
+neutron_dhcp_config:
+  log-facility: "/var/log/neutron/neutron-dnsmasq.log"
+
 ###
 ### Tunable Overrides (Sorted alphabetically)
 ###
@@ -107,7 +115,6 @@ neutron_calico_felix_ini_overrides: {}
 neutron_calico_felix_init_overrides: {}
 neutron_dhcp_agent_ini_overrides: {}
 neutron_dhcp_agent_init_overrides: {}
-neutron_dnsmasq_neutron_conf_overrides: {}
 neutron_dragonflow_controller_agent_init_overrides: {}
 neutron_dragonflow_ini_overrides: {}
 neutron_dragonflow_l3_agent_init_overrides: {}

tasks/neutron_post_install.yml

@@ -58,14 +58,12 @@
   with_items: "{{ neutron_plugin_types }}"
 
 - name: Generate neutron dnsmasq Config
-  config_template:
+  template:
     src: "dnsmasq-neutron.conf.j2"
     dest: "{{ neutron_conf_dir }}/dnsmasq-neutron.conf"
     owner: "root"
     group: "{{ neutron_system_group_name }}"
     mode: "0640"
-    config_overrides: "{{ neutron_dnsmasq_neutron_conf_overrides }}"
-    config_type: "ini"
   notify:
     - Restart neutron services
   when: