Merge "adds the config_template to neutron"

playbooks/roles/os_neutron/defaults/main.yml

@@ -271,3 +271,15 @@ neutron_service_names:
   - neutron-metadata-agent
   - neutron-metering-agent
   - neutron-server
+
+## Tunable overrides
+neutron_neutron_conf_overrides: {}
+neutron_ml2_conf_ini_overrides: {}
+neutron_dhcp_agent_ini_overrides: {}
+neutron_api_paste_ini_overrides: {}
+neutron_rootwrap_conf_overrides: {}
+neutron_policy_overrides: {}
+neutron_dnsmasq_neutron_conf_overrides: {}
+neutron_l3_agent_ini_overrides: {}
+neutron_metadata_agent_ini_overrides: {}
+neutron_metering_agent_ini_overrides: {}

playbooks/roles/os_neutron/tasks/neutron_post_install.yml

@@ -26,32 +26,71 @@
   tags:
     - neutron-config
 
-- name: Generate neutron Config
-  template:
+- name: Copy neutron config
+  config_template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     owner: "{{ neutron_system_user_name }}"
     group: "{{ neutron_system_group_name }}"
+    mode: "0644"
+    config_overrides: "{{ item.config_overrides }}"
+    config_type: "{{ item.config_type }}"
   with_items:
-    - { src: "neutron.conf.j2", dest: "/etc/neutron/neutron.conf" }
-    - { src: "plugins/ml2/ml2_conf.ini.j2", dest: "/etc/neutron/plugins/ml2/ml2_conf.ini" }
+    - src: "neutron.conf.j2"
+      dest: "/etc/neutron/neutron.conf"
+      config_overrides: "{{ neutron_neutron_conf_overrides }}"
+      config_type: "ini"
+    - src: "plugins/ml2/ml2_conf.ini.j2"
+      dest: "/etc/neutron/plugins/ml2/ml2_conf.ini"
+      config_overrides: "{{ neutron_ml2_conf_ini_overrides }}"
+      config_type: "ini"
+    - src: "api-paste.ini.j2"
+      dest: "/etc/neutron/api-paste.ini"
+      config_overrides: "{{ neutron_api_paste_ini_overrides }}"
+      config_type: "ini"
+    - src: "rootwrap.conf.j2"
+      dest: "/etc/neutron/rootwrap.conf"
+      config_overrides: "{{ neutron_rootwrap_conf_overrides }}"
+      config_type: "ini"
+    - src: "policy.json.j2"
+      dest: "/etc/neutron/policy.json"
+      config_overrides: "{{ neutron_policy_overrides }}"
+      config_type: "json"
   notify:
     - Restart neutron services
   tags:
     - neutron-config
 
 - name: Generate neutron agent only Config
-  template:
+  config_template:
     src: "{{ item.src }}"
     dest: "{{ item.dest }}"
     owner: "{{ neutron_system_user_name }}"
     group: "{{ neutron_system_group_name }}"
+    mode: "0644"
+    config_overrides: "{{ item.config_overrides }}"
+    config_type: "{{ item.config_type }}"
   with_items:
-    - { src: "dhcp_agent.ini.j2", dest: "/etc/neutron/dhcp_agent.ini" }
-    - { src: "dnsmasq-neutron.conf.j2", dest: "/etc/neutron/dnsmasq-neutron.conf" }
-    - { src: "l3_agent.ini.j2", dest: "/etc/neutron/l3_agent.ini" }
-    - { src: "metadata_agent.ini.j2", dest: "/etc/neutron/metadata_agent.ini" }
-    - { src: "metering_agent.ini.j2", dest: "/etc/neutron/metering_agent.ini" }
+    - src: "dhcp_agent.ini.j2"
+      dest: "/etc/neutron/dhcp_agent.ini"
+      config_overrides: "{{ neutron_dhcp_agent_ini_overrides }}"
+      config_type: "ini"
+    - src: "dnsmasq-neutron.conf.j2"
+      dest: "/etc/neutron/dnsmasq-neutron.conf"
+      config_overrides: "{{ neutron_dnsmasq_neutron_conf_overrides }}"
+      config_type: "ini"
+    - src: "l3_agent.ini.j2"
+      dest: "/etc/neutron/l3_agent.ini"
+      config_overrides: "{{ neutron_l3_agent_ini_overrides }}"
+      config_type: "ini"
+    - src: "metadata_agent.ini.j2"
+      dest: "/etc/neutron/metadata_agent.ini"
+      config_overrides: "{{ neutron_metadata_agent_ini_overrides }}"
+      config_type: "ini"
+    - src: "metering_agent.ini.j2"
+      dest: "/etc/neutron/metering_agent.ini"
+      config_overrides: "{{ neutron_metering_agent_ini_overrides }}"
+      config_type: "ini"
   notify:
     - Restart neutron services
   when: >
@@ -66,8 +105,6 @@
     owner: "{{ neutron_system_user_name }}"
     group: "{{ neutron_system_group_name }}"
   with_items:
-    - { src: "api-paste.ini", dest: "/etc/neutron/api-paste.ini" }
-    - { src: "rootwrap.conf", dest: "/etc/neutron/rootwrap.conf" }
     - { src: "rootwrap.d/debug.filters", dest: "/etc/neutron/rootwrap.d/debug.filters" }
     - { src: "rootwrap.d/dhcp.filters", dest: "/etc/neutron/rootwrap.d/dhcp.filters" }
     - { src: "rootwrap.d/ipset-firewall.filters", dest: "/etc/neutron/rootwrap.d/ipset-firewall.filters" }
@@ -85,20 +122,6 @@
   tags:
     - neutron-config
 
-- name: Apply updates to Policy file
-  config_template:
-    src: "policy.json"
-    dest: "/etc/neutron/policy.json"
-    owner: "{{ neutron_system_user_name }}"
-    group: "{{ neutron_system_group_name }}"
-    mode: "0644"
-    config_overrides: "{{ neutron_policy_overrides|default({}) }}"
-    config_type: "json"
-  notify:
-    - Restart neutron services
-  tags:
-    - neutron-config
-
 - name: Drop iptables checksum fix
   copy:
     src: "post-up-checksum-rules"