From 09141b6c9bf48bc874fa86e183ecf7c3ad90db18 Mon Sep 17 00:00:00 2001
From: Mathias Ewald <mewald@evoila.de>
Date: Sat, 17 Dec 2016 16:05:33 +0100
Subject: [PATCH] Support neutron availability zones

Enable host-specific configuration for l3 / dhcp agent

Change-Id: Id2d66b9fbb82d28fef8f4fd31ab04b3e3506e21d
Closes-Bug: 1650766
---
 ansible/roles/neutron/tasks/config.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/ansible/roles/neutron/tasks/config.yml b/ansible/roles/neutron/tasks/config.yml
index bc18d03808..a2e7d08fa0 100644
--- a/ansible/roles/neutron/tasks/config.yml
+++ b/ansible/roles/neutron/tasks/config.yml
@@ -116,6 +116,7 @@
     sources:
       - "{{ role_path }}/templates/dhcp_agent.ini.j2"
       - "{{ node_custom_config }}/neutron/dhcp_agent.ini"
+      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/dhcp_agent.ini"
     dest: "{{ node_config_directory }}/{{ item }}/dhcp_agent.ini"
   with_items:
     - "neutron-dhcp-agent"
@@ -134,6 +135,7 @@
     sources:
       - "{{ role_path }}/templates/l3_agent.ini.j2"
       - "{{ node_custom_config }}/neutron/l3_agent.ini"
+      - "{{ node_custom_config }}/neutron/{{ inventory_hostname }}/l3_agent.ini"
     dest: "{{ node_config_directory }}/{{ item }}/l3_agent.ini"
   with_items:
     - "neutron-l3-agent"