diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/aaa.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/aaa.md index b532701e989..f8b46532894 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/aaa.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/aaa.md @@ -116,19 +116,11 @@ radius-server host 10.10.10.158 key 7 | TACACS1 | tacacs+ | default | 10.10.10.249 | | TACACS2 | tacacs+ | mgt | 192.168.10.157 | | TACACS2 | tacacs+ | default | 10.10.10.248 | -| RADIUS2 | radius | mgt | 192.168.10.157 | -| RADIUS1 | radius | default | 192.168.10.157 | #### AAA Server Groups Device Configuration ```eos ! -aaa group server radius RADIUS1 - server 192.168.10.157 -! -aaa group server radius RADIUS2 - server 192.168.10.157 vrf mgt -! aaa group server tacacs+ TACACS1 server 10.10.10.157 vrf mgt server 10.10.10.249 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/aaa.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/aaa.cfg index e6ef37f54ba..a7ba939f1c7 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/aaa.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/aaa.cfg @@ -9,12 +9,6 @@ tacacs-server host 10.10.10.158 key 7 071B245F5A tacacs-server host 10.10.10.159 key 8a $kUVyoj7FVQ//yw9D2lbqjA==$kxxohBiofI46IX3pw18KYQ==$DOOM0l9uU4TrQt2kyA7XCKtjUA== tacacs-server timeout 10 ! -aaa group server radius RADIUS1 - server 192.168.10.157 -! -aaa group server radius RADIUS2 - server 192.168.10.157 vrf mgt -! aaa group server tacacs+ TACACS1 server 10.10.10.157 vrf mgt server 10.10.10.249 diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/aaa.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/aaa.yml index a3678ca8b91..e239dbfbcae 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/aaa.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/aaa.yml @@ -46,15 +46,6 @@ aaa_server_groups: - server: 192.168.10.157 vrf: mgt - server: 10.10.10.248 - - name: RADIUS2 - type: radius - servers: - - server: 192.168.10.157 - vrf: mgt - - name: RADIUS1 - type: radius - servers: - - server: 192.168.10.157 ## AAA Authentication aaa_authentication: diff --git a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups.j2 b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups.j2 index 3075ad25606..23c0d312b7a 100644 --- a/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups.j2 +++ b/python-avd/pyavd/_eos_cli_config_gen/j2templates/eos/aaa-server-groups.j2 @@ -4,7 +4,7 @@ that can be found in the LICENSE file. #} {# eos - aaa server groups #} -{% for aaa_server_group in aaa_server_groups | arista.avd.natural_sort('type') | arista.avd.natural_sort('name') %} +{% for aaa_server_group in aaa_server_groups | arista.avd.natural_sort('name') | arista.avd.natural_sort('type') %} {% if aaa_server_group.type is arista.avd.defined and aaa_server_group.name is arista.avd.defined %} ! aaa group server {{ aaa_server_group.type }} {{ aaa_server_group.name }}