Skip to content

Commit

Permalink
Trim whitespace in Neutron configuration file for LBaaS
Browse files Browse the repository at this point in the history
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
  • Loading branch information
mnaser committed Mar 10, 2018
1 parent 6341bbe commit 30e20d6
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion templates/neutron.conf.j2
Expand Up @@ -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 %}
Expand Down

0 comments on commit 30e20d6

Please sign in to comment.