Skip to content

Commit 38c7277

Browse files
authored
Merge pull request #56 from stackhpc/upstream/xena-2022-09-26
Synchronise xena with upstream
2 parents 7837f14 + 612fc25 commit 38c7277

File tree

2 files changed

+9
-3
lines changed

2 files changed

+9
-3
lines changed

ansible/roles/nclu-switch/templates/nclu-config.j2

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,10 +4,10 @@
44
{% endfor %}
55

66
{% for interface, config in nclu_switch_interface_config.items() %}
7-
{% if config.description is defined %}
8-
add {{ config.type | default("interface") }} {{ interface }} alias {{ config.description }}
9-
{% endif %}
107
{% for line in config.config %}
118
add {{ config.type | default("interface") }} {{ interface }} {{ line }}
129
{% endfor %}
10+
{% if config.description is defined %}
11+
add {{ config.type | default("interface") }} {{ interface }} alias {{ config.description }}
12+
{% endif %}
1313
{% endfor %}
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
---
2+
fixes:
3+
- |
4+
Fixes an issue with nclu-switch command ordering, when description was
5+
applied first to a non-existent (virtual) interface. See `story 2010279
6+
<https://storyboard.openstack.org/#!/story/2010279>`__ for details.

0 commit comments

Comments
 (0)