Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix qos order structured and take ! out of if #589

Merged
merged 2 commits into from
Jan 7, 2021
Merged

Fix qos order structured and take ! out of if #589

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c7dc600
QOS update order, and fix the ! out of if
onurgashi Jan 7, 2021
8c9d9e1
Molecule artifacts
onurgashi Jan 7, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ...ta/avd/molecule/eos_cli_config_gen/documentation/devices/ethernet-interfaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ IP virtual router MAC address not defined

| VRF | Routing Enabled |
| --- | --------------- |
| default | false|
| default | false|
### IP Routing Device Configuration

```eos
Expand Down
2 changes: 1 addition & 1 deletion ...vd/molecule/eos_cli_config_gen/documentation/devices/port-channel-interfaces.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -364,7 +364,7 @@ IP virtual router MAC address not defined

| VRF | Routing Enabled |
| --- | --------------- |
| default | false|
| default | false|
### IP Routing Device Configuration

```eos
Expand Down
2 changes: 1 addition & 1 deletion ...llections/arista/avd/molecule/eos_cli_config_gen/intended/configs/ethernet-interfaces.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,4 +32,4 @@ interface Management1
vrf MGMT
ip address 10.73.255.122/24
!
end
end
2 changes: 1 addition & 1 deletion ...tions/arista/avd/molecule/eos_cli_config_gen/intended/configs/port-channel-interfaces.cfg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,4 +72,4 @@ interface Management1
vrf MGMT
ip address 10.73.255.122/24
!
end
end
4 changes: 2 additions & 2 deletions ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos-intended-config.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,8 @@ hostname {{ inventory_hostname }}
{% include 'eos/ip-routing.j2' %}
{# IPv6 Routing #}
{% include 'eos/ipv6-routing.j2' %}
{# qos #}
{% include 'eos/qos.j2' %}
{# IP Extended Communities #}
{% include 'eos/ip-extended-communities.j2' %}
{# Prefix-lists #}
Expand Down Expand Up @@ -174,8 +176,6 @@ hostname {{ inventory_hostname }}
{% include 'eos/management-security.j2' %}
{# management ssh #}
{% include 'eos/management-ssh.j2' %}
{# qos #}
{% include 'eos/qos.j2' %}
{# custom templates #}
{% include 'eos/custom-templates.j2' %}
!
Expand Down
2 changes: 1 addition & 1 deletion ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/qos.j2
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{# eos - qos #}
{% if qos is defined %}
{% if qos.rewrite_dscp is defined and qos.rewrite_dscp == true %}
!
{% if qos.rewrite_dscp is defined and qos.rewrite_dscp == true %}
qos rewrite dscp
{% endif %}
{% if qos.map is defined and qos is not none %}
Expand Down