diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/dhcp-relay.md b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/dhcp-relay.md index c11aafa523d..fd275f47435 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/dhcp-relay.md +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/documentation/devices/dhcp-relay.md @@ -41,6 +41,7 @@ interface Management1 ### DHCP Relay Summary - DHCP Relay is disabled for tunnelled requests +- DHCP Relay is disabled for MLAG peer-link requests | DHCP Relay Servers | | ------------------ | @@ -55,4 +56,5 @@ dhcp relay server dhcp-relay-server1 server dhcp-relay-server2 tunnel requests disabled + mlag peer-link requests disabled ``` diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dhcp-relay.cfg b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dhcp-relay.cfg index bfa2e0a9e95..18c31cdcee6 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dhcp-relay.cfg +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/intended/configs/dhcp-relay.cfg @@ -4,6 +4,7 @@ dhcp relay server dhcp-relay-server1 server dhcp-relay-server2 tunnel requests disabled + mlag peer-link requests disabled ! transceiver qsfp default-mode 4x10G ! diff --git a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dhcp-relay.yml b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dhcp-relay.yml index 02efdfe631e..36b1d80a633 100644 --- a/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dhcp-relay.yml +++ b/ansible_collections/arista/avd/molecule/eos_cli_config_gen/inventory/host_vars/dhcp-relay.yml @@ -3,3 +3,4 @@ dhcp_relay: - dhcp-relay-server2 - dhcp-relay-server1 tunnel_requests_disabled: true + mlag_peerlink_requests_disabled: true diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dhcp-relay.md b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dhcp-relay.md index 772db4a1d15..a3b989b02f1 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dhcp-relay.md +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/docs/tables/dhcp-relay.md @@ -11,6 +11,7 @@ | [  servers](## "dhcp_relay.servers") | List, items: String | | | | | | [    - <str>](## "dhcp_relay.servers.[].<str>") | String | | | | Server IP or Hostname | | [  tunnel_requests_disabled](## "dhcp_relay.tunnel_requests_disabled") | Boolean | | | | | + | [  mlag_peerlink_requests_disabled](## "dhcp_relay.mlag_peerlink_requests_disabled") | Boolean | | | | | === "YAML" @@ -19,4 +20,5 @@ servers: - tunnel_requests_disabled: + mlag_peerlink_requests_disabled: ``` diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json index e239def756d..614570716da 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.jsonschema.json @@ -1442,6 +1442,10 @@ "tunnel_requests_disabled": { "type": "boolean", "title": "Tunnel Requests Disabled" + }, + "mlag_peerlink_requests_disabled": { + "type": "boolean", + "title": "MLAG Peerlink Requests Disabled" } }, "additionalProperties": false, diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml index 111dfc6367d..492e8cac38c 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/eos_cli_config_gen.schema.yml @@ -1012,6 +1012,8 @@ keys: description: Server IP or Hostname tunnel_requests_disabled: type: bool + mlag_peerlink_requests_disabled: + type: bool dns_domain: type: str description: Domain Name diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_relay.schema.yml b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_relay.schema.yml index a96cf1f242e..573f82b9147 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_relay.schema.yml +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/schemas/schema_fragments/dhcp_relay.schema.yml @@ -16,3 +16,5 @@ keys: description: Server IP or Hostname tunnel_requests_disabled: type: bool + mlag_peerlink_requests_disabled: + type: bool diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/dhcp-relay.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/dhcp-relay.j2 index d6c0801b76c..72e2d2fbc92 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/dhcp-relay.j2 +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/documentation/dhcp-relay.j2 @@ -12,10 +12,15 @@ {% if dhcp_relay.tunnel_requests_disabled is arista.avd.defined(true) %} - DHCP Relay is disabled for tunnelled requests -{% elif dhcp_relay.tunnel_requests_disabled is arista.avd.defined(false) %} +{% else %} - DHCP Relay is enabled for tunnelled requests {% endif %} +{% if dhcp_relay.mlag_peerlink_requests_disabled is arista.avd.defined(true) %} +- DHCP Relay is disabled for MLAG peer-link requests +{% else %} +- DHCP Relay is enabled for MLAG peer-link requests +{% endif %} {% if dhcp_relay.servers is arista.avd.defined %} | DHCP Relay Servers | diff --git a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/dhcp-relay.j2 b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/dhcp-relay.j2 index 714fee2a3fb..1d999b4d414 100644 --- a/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/dhcp-relay.j2 +++ b/ansible_collections/arista/avd/roles/eos_cli_config_gen/templates/eos/dhcp-relay.j2 @@ -12,7 +12,8 @@ dhcp relay {% endfor %} {% if dhcp_relay.tunnel_requests_disabled is arista.avd.defined(true) %} tunnel requests disabled -{% elif dhcp_relay.tunnel_requests_disabled is arista.avd.defined(false) %} - no tunnel requests disabled +{% endif %} +{% if dhcp_relay.mlag_peerlink_requests_disabled is arista.avd.defined(true) %} + mlag peer-link requests disabled {% endif %} {% endif %}