diff options
| author | James McCarthy <james.m.mccarthy@oracle.com> | 2016-10-14 15:02:54 +0100 |
|---|---|---|
| committer | James McCarthy <james.m.mccarthy@oracle.com> | 2016-10-14 15:05:45 +0100 |
| commit | cd968665eb88124a199b3a2afd12c990703d38bd (patch) | |
| tree | d5ed9a6b9a064cfb470fe6af4f0a84bc73fad991 | |
| parent | b53988a08875309d531d1e17128e7a37fca3049a (diff) | |
| download | kolla-cd968665eb88124a199b3a2afd12c990703d38bd.tar.gz kolla-cd968665eb88124a199b3a2afd12c990703d38bd.zip | |
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
| -rw-r--r-- | ansible/roles/neutron/templates/l3_agent.ini.j2 | 6 |
1 files 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 679730f20..c869fbc77 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 %} |