diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-14 15:57:39 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-14 15:57:39 +0000 |
| commit | 0bc18f0bf69f9a8c32372a43ef2ca2bf1b5f5094 (patch) | |
| tree | 6988978bbee46db0e590783c171e66ba18864765 | |
| parent | 3257d04adbc4e96117c891952122a3495c99b910 (diff) | |
| parent | cd968665eb88124a199b3a2afd12c990703d38bd (diff) | |
| download | kolla-0bc18f0bf69f9a8c32372a43ef2ca2bf1b5f5094.tar.gz kolla-0bc18f0bf69f9a8c32372a43ef2ca2bf1b5f5094.zip | |
Merge "Remove indentation from l3_agent.ini.j2"
| -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 %} |