From cd968665eb88124a199b3a2afd12c990703d38bd Mon Sep 17 00:00:00 2001
From: James McCarthy <james.m.mccarthy@oracle.com>
Date: Fri, 14 Oct 2016 15:02:54 +0100
Subject: [PATCH] Remove indentation from l3_agent.ini.j2
If enable_neutron_dvr is set, it leads to a failure of the
'Copying over l3_agent.ini' task due to parsing errors.
TrivialFix
Closes-bug: #1633488
Change-Id: Ia30970d65cf7b09fff336fe878d2be02e934b082
---
ansible/roles/neutron/templates/l3_agent.ini.j2 | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/ansible/roles/neutron/templates/l3_agent.ini.j2 b/ansible/roles/neutron/templates/l3_agent.ini.j2
index 679730f20e..c869fbc775 100644
--- a/ansible/roles/neutron/templates/l3_agent.ini.j2
+++ b/ansible/roles/neutron/templates/l3_agent.ini.j2
@@ -1,11 +1,11 @@
#jinja2: trim_blocks: False
[DEFAULT]
{% if enable_neutron_dvr | bool %}
- {% if inventory_hostname in groups['network'] %}
+{% if inventory_hostname in groups['network'] %}
agent_mode = dvr_snat
- {% elif inventory_hostname in groups['compute'] %}
+{% elif inventory_hostname in groups['compute'] %}
agent_mode = dvr
- {% endif %}
+{% endif %}
{% else %}
agent_mode = legacy
{% endif %}