From 6ab0629e9de07bcd887615ff2dde6416d5fa158b Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Fri, 19 Dec 2025 11:51:13 +0100 Subject: [PATCH 1/6] Migrate to new sonic-config role for community SONiC flavor --- deploy_partition.yaml | 2 +- .../group_vars/all/release_vector.yaml | 7 ++-- inventories/group_vars/leaves/main.yaml | 32 ++++++++----------- 3 files changed, 20 insertions(+), 21 deletions(-) diff --git a/deploy_partition.yaml b/deploy_partition.yaml index 58bcefca..58c8b6a4 100644 --- a/deploy_partition.yaml +++ b/deploy_partition.yaml @@ -11,7 +11,7 @@ roles: - name: ansible-common tags: always - - name: metal-roles/partition/roles/sonic + - name: metal-roles/partition/roles/sonic-config tags: sonic - name: sonic tags: sonic diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index 24138ded..8e128424 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -15,7 +15,7 @@ metal_stack_release_vectors: # metal_api_image_name: # metal_api_image_tag: # metal_apiserver_image_name: -# metal_apiserver_image_tag: +metal_apiserver_image_tag: v0.1.1 # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: @@ -32,12 +32,15 @@ metal_stack_release_vectors: # ... # +sonic_configdb_utils_image_name: ghcr.io/metal-stack/sonic-configdb-utils +sonic_configdb_utils_image_tag: platform-flag + ## ## for ansible roles ## # ansible_common_version: -# metal_roles_version: +metal_roles_version: sonic-config-platform # metal_ansible_modules_version: ## diff --git a/inventories/group_vars/leaves/main.yaml b/inventories/group_vars/leaves/main.yaml index cc36a1e6..eeb1a8c7 100644 --- a/inventories/group_vars/leaves/main.yaml +++ b/inventories/group_vars/leaves/main.yaml @@ -2,29 +2,25 @@ dhcp_listening_interfaces: - Vlan4000 -metal_core_spine_uplinks: - - Ethernet120 - -sonic_docker_routing_config_mode: split-unified -sonic_frr_mgmt_framework_config: false -sonic_frr_render: false +sonic_config_docker_routing_config_mode: split-unified +sonic_config_frr_mgmt_framework_config: false +sonic_config_frr_render: false -sonic_loopback_address: "{{ lo }}" -sonic_mgmtif_ip: "{{ ansible_host }}/16`" -sonic_mgmtif_gateway: "172.17.0.1" +sonic_config_loopback_address: "{{ lo }}" +sonic_config_mgmt_interface: + ip: "{{ ansible_host }}/16`" + gateway_address: "172.17.0.1" -sonic_mgmt_vrf: false +sonic_config_mgmt_vrf: false +sonic_config_nameservers: "{{ router_nameservers }}" -sonic_nameservers: "{{ router_nameservers }}" - -sonic_vlans: +sonic_config_vlans: - id: 4000 ip: "{{ metal_core_cidr }}" -# Dummy VTEP so that basic VXLAN config will be deployed by sonic role: -sonic_vteps: -- comment: Dummy - vlan: Vlan3999 - vni: 103999 +sonic_config_vtep: + enabled: true metal_core_cidr_mask: 25 +metal_core_spine_uplinks: + - Ethernet120 From 5503db1361bdf87d7fba48cf3be38b82fa3d1895 Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Fri, 19 Dec 2025 15:20:51 +0100 Subject: [PATCH 2/6] bgp ports --- inventories/group_vars/leaves/main.yaml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/inventories/group_vars/leaves/main.yaml b/inventories/group_vars/leaves/main.yaml index eeb1a8c7..e077cabe 100644 --- a/inventories/group_vars/leaves/main.yaml +++ b/inventories/group_vars/leaves/main.yaml @@ -2,8 +2,10 @@ dhcp_listening_interfaces: - Vlan4000 +sonic_config_bgp_ports: + - Ethernet120 + sonic_config_docker_routing_config_mode: split-unified -sonic_config_frr_mgmt_framework_config: false sonic_config_frr_render: false sonic_config_loopback_address: "{{ lo }}" From df47bd4b8362e253eeac5214e8497ae6df69bc9b Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Thu, 8 Jan 2026 13:27:36 +0100 Subject: [PATCH 3/6] metal-core fix for port config --- files/ssh/config | 1 + inventories/group_vars/all/release_vector.yaml | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/files/ssh/config b/files/ssh/config index ba8bb7ba..f8e20889 100644 --- a/files/ssh/config +++ b/files/ssh/config @@ -4,6 +4,7 @@ Host leaf* Host * User metal IdentityFile files/ssh/id_rsa + IdentitiesOnly yes PasswordAuthentication no StrictHostKeyChecking no UserKnownHostsFile /dev/null diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index 8e128424..f2ce82b5 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -22,8 +22,8 @@ metal_apiserver_image_tag: v0.1.1 # metal_masterdata_api_image_tag: # metal_console_image_name: # metal_console_image_tag: -# metal_core_image_name: -# metal_core_image_tag: +metal_core_image_name: ghcr.io/metal-stack/metal-core +metal_core_image_tag: get-ports-from-running-config # headscale_image_tag: v0.26.1 # headscale_db_backup_restore_sidecar_image_tag: latest # headscale_db_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar From fb8f32b44941c212c95d49a83454b147e744d7a0 Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Wed, 14 Jan 2026 12:03:28 +0100 Subject: [PATCH 4/6] remove overrides --- inventories/group_vars/all/release_vector.yaml | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index f2ce82b5..503afdba 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -22,25 +22,24 @@ metal_apiserver_image_tag: v0.1.1 # metal_masterdata_api_image_tag: # metal_console_image_name: # metal_console_image_tag: -metal_core_image_name: ghcr.io/metal-stack/metal-core -metal_core_image_tag: get-ports-from-running-config +# metal_core_image_name: +# metal_core_image_tag: # headscale_image_tag: v0.26.1 # headscale_db_backup_restore_sidecar_image_tag: latest # headscale_db_backup_restore_sidecar_image_name: ghcr.io/metal-stack/backup-restore-sidecar # headscale_db_image_tag: 17-alpine # headscale_db_image_name: postgres +# sonic_configdb_utils_image_name: +# sonic_configdb_utils_image_tag: # ... # -sonic_configdb_utils_image_name: ghcr.io/metal-stack/sonic-configdb-utils -sonic_configdb_utils_image_tag: platform-flag - ## ## for ansible roles ## # ansible_common_version: -metal_roles_version: sonic-config-platform +# metal_roles_version: # metal_ansible_modules_version: ## From 9adab85b2d679dbb805f69c75a65675fb93d6459 Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Wed, 14 Jan 2026 13:16:04 +0100 Subject: [PATCH 5/6] remove metal-apiserver override --- inventories/group_vars/all/release_vector.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/inventories/group_vars/all/release_vector.yaml b/inventories/group_vars/all/release_vector.yaml index 503afdba..2263c0a2 100644 --- a/inventories/group_vars/all/release_vector.yaml +++ b/inventories/group_vars/all/release_vector.yaml @@ -15,7 +15,7 @@ metal_stack_release_vectors: # metal_api_image_name: # metal_api_image_tag: # metal_apiserver_image_name: -metal_apiserver_image_tag: v0.1.1 +# metal_apiserver_image_tag: # metal_metalctl_image_name: # metal_metalctl_image_tag: # metal_masterdata_api_image_name: From a6293e0f7aa55b2f77867b91847bfe2e7f1c8815 Mon Sep 17 00:00:00 2001 From: Ilja Rotar Date: Wed, 14 Jan 2026 13:42:12 +0100 Subject: [PATCH 6/6] remove bgp ports --- inventories/group_vars/leaves/main.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/inventories/group_vars/leaves/main.yaml b/inventories/group_vars/leaves/main.yaml index e077cabe..79e2bdcc 100644 --- a/inventories/group_vars/leaves/main.yaml +++ b/inventories/group_vars/leaves/main.yaml @@ -2,7 +2,7 @@ dhcp_listening_interfaces: - Vlan4000 -sonic_config_bgp_ports: +metal_core_spine_uplinks: - Ethernet120 sonic_config_docker_routing_config_mode: split-unified @@ -24,5 +24,3 @@ sonic_config_vtep: enabled: true metal_core_cidr_mask: 25 -metal_core_spine_uplinks: - - Ethernet120