openstack/kolla-ansible
Code Issues Proposed changes

Remove indentation from l3_agent.ini.j2

Browse Source 
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
This commit is contained in:
James McCarthy 2016-10-14 15:02:54 +01:00
parent b53988a088
commit cd968665eb
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/roles/neutron/templates/l3_agent.ini.j2
View File

@ -1,11 +1,11 @@
#jinja2: trim_blocks: False #jinja2: trim_blocks: False
[DEFAULT] [DEFAULT]
{% if enable_neutron_dvr | bool %} {% if enable_neutron_dvr | bool %}
{% if inventory_hostname in groups['network'] %} {% if inventory_hostname in groups['network'] %}
agent_mode = dvr_snat agent_mode = dvr_snat
{% elif inventory_hostname in groups['compute'] %} {% elif inventory_hostname in groups['compute'] %}
agent_mode = dvr agent_mode = dvr
{% endif %} {% endif %}
{% else %} {% else %}
agent_mode = legacy agent_mode = legacy
{% endif %} {% endif %}