From 30e20d6cd7a6a248aa2336f501e3de9b47f263be Mon Sep 17 00:00:00 2001
From: Mohammed Naser <mnaser@vexxhost.com>
Date: Sat, 10 Mar 2018 16:31:03 -0500
Subject: [PATCH] Trim whitespace in Neutron configuration file for LBaaS

If neutron_lbaasv2 is set to true, the if statement is evaluated
and an extra 2 spaces are added.  This results in two spaces being
added before the '# General, applies to all host groups' which
results in config_template being unable to parse the file in
addition to Neutron failing to parse the configuration as well.

Change-Id: I4e04e1b9e6219d60c703240d01d6bf8a1a32ccda
---
 templates/neutron.conf.j2 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/neutron.conf.j2 b/templates/neutron.conf.j2
index a4f0e734..f1b1a384 100644
--- a/templates/neutron.conf.j2
+++ b/templates/neutron.conf.j2
@@ -7,7 +7,7 @@
   {% endif %}
 {% endfor %}
 
-{% if (neutron_lbaasv2|bool) and ('neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' not in neutron_plugin_base) %}
+{% if (neutron_lbaasv2|bool) and ('neutron_lbaas.services.loadbalancer.plugin.LoadBalancerPluginv2' not in neutron_plugin_base) -%}
   {% if neutron_octavia_proxy_plugin|bool %}
     {% set _ = neutron_plugin_loaded_base.append("lbaasv2-proxy") %}
   {% else %}