From cc0709792ba0d9fa03e53307f3fa833d4e44552b Mon Sep 17 00:00:00 2001
From: Paul Bourke <paul.bourke@oracle.com>
Date: Tue, 4 Oct 2016 16:19:26 +0100
Subject: [PATCH] Fix l3_agent.ini rendering error when DVR

The if/else blocks in this file cause a rendering error on control nodes
when enable_neutron_dvr: yes

ParsingError: File contains parsing errors: <???>
        [line  3]: u'    external_network_bridge =\n'

Change-Id: Ia461dcbbec531c4c6295b3c7e10da12c57b7d58b
Closes-Bug: 1626995
---
 ansible/roles/neutron/templates/l3_agent.ini.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ansible/roles/neutron/templates/l3_agent.ini.j2 b/ansible/roles/neutron/templates/l3_agent.ini.j2
index b8a165bfac..679730f20e 100644
--- a/ansible/roles/neutron/templates/l3_agent.ini.j2
+++ b/ansible/roles/neutron/templates/l3_agent.ini.j2
@@ -1,4 +1,4 @@
-# l3_agent.ini
+#jinja2: trim_blocks: False
 [DEFAULT]
 {% if enable_neutron_dvr | bool %}
     {% if inventory_hostname in groups['network'] %}