openstack
/
neutron
Code Issues Proposed changes

Remove more empty lines in ipv6 ra conf. 

If there are many conditional statement or loop, ra conf will have
more empty lines.

Change-Id: I8b3ba4ea88e795795e7f73580c4096dca8a46382
This commit is contained in:
Jiaping LI 2020-09-30 11:02:02 +08:00
parent 946057cf27
commit f545c002dc
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
neutron/agent/linux/ra.py
View File

@ -42,23 +42,23 @@ CONFIG_TEMPLATE = jinja2.Template("""interface {{ interface_name }}
MinRtrAdvInterval {{ min_rtr_adv_interval }};
MaxRtrAdvInterval {{ max_rtr_adv_interval }};
{% if network_mtu >= constants.IPV6_MIN_MTU %}
{%- if network_mtu >= constants.IPV6_MIN_MTU %}
AdvLinkMTU {{network_mtu}};
{% endif %}
{% if constants.DHCPV6_STATELESS in ra_modes %}
{%- if constants.DHCPV6_STATELESS in ra_modes %}
AdvOtherConfigFlag on;
{% endif %}
{% if constants.DHCPV6_STATEFUL in ra_modes %}
{%- if constants.DHCPV6_STATEFUL in ra_modes %}
AdvManagedFlag on;
{% endif %}
{% if dns_servers %}
{%- if dns_servers %}
RDNSS {% for dns in dns_servers %} {{ dns }} {% endfor %} {};
{% endif %}
{% for prefix in auto_config_prefixes %}
{%- for prefix in auto_config_prefixes %}
prefix {{ prefix }}
{
AdvOnLink on;
@ -66,7 +66,7 @@ CONFIG_TEMPLATE = jinja2.Template("""interface {{ interface_name }}
};
{% endfor %}
{% for prefix in stateful_config_prefixes %}
{%- for prefix in stateful_config_prefixes %}
prefix {{ prefix }}
{
AdvOnLink on;