Configure metal core vlan (#288)

metal-stack · Jul 18, 2024 · c654c4f · c654c4f
1 parent aa86dfb
commit c654c4f
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 1 deletion.
diff --git a/partition/roles/metal-core/README.md b/partition/roles/metal-core/README.md
@@ -15,7 +15,7 @@ You can look up all the default values of this role [here](defaults/main/main.ya
 | metal_core_image_name                     | yes       | Image name of metal-core                                                                                                                                                   |
 | metal_core_image_tag                      | yes       | Image tag of metal-core                                                                                                                                                    |
 | metal_core_cidr                           |           |                                                                                                                                                                            |
-| metal_core_log_driver                      |           | The log driver used for the metal-core container log                                                                                                                                                  |
+| metal_core_log_driver                     |           | The log driver used for the metal-core container log                                                                                                                       |
 | metal_core_log_level                      |           | The metal-core log level                                                                                                                                                   |
 | metal_core_rack_id                        | yes       | The rack id describing the rack in which the leaf switches are contained. Can be a logical rack name and is used by the metal-api to identify the switch pair              |
 | metal_core_reconfigure_switch             |           | If set to true, metal-core will automatically reconfigure files on the switch                                                                                              |
@@ -31,3 +31,4 @@ You can look up all the default values of this role [here](defaults/main/main.ya
 | metal_core_consider_hosts_file_resolution |           | If set to true mounts `/etc/nsswitch.conf` into the container to enable dns resolution with the hosts file (see [go#22846](https://github.com/golang/go/issues/22846))     |
 | metal_core_interfaces_tpl_file            |           | The golang template file to use for rendering `/etc/network/interfaces`. If this is left blank the default template shipped with metal-core will be used.                  |
 | metal_core_frr_tpl_file                   |           | The golang template file to use for rendering `/etc/frr/frr.conf`. If this is left blank the default template shipped with metal-core will be used.                        |
+| metal_core_pxe_vlan_id                    |           | The VLAN ID for the PXE machines. Defaults to `4000`.                                                                                                                      |
diff --git a/partition/roles/metal-core/defaults/main/main.yaml b/partition/roles/metal-core/defaults/main/main.yaml
@@ -20,3 +20,5 @@ metal_core_consider_hosts_file_resolution: false
 
 metal_core_interfaces_tpl_file: ""
 metal_core_frr_tpl_file: ""
+
+metal_core_pxe_vlan_id: 4000
diff --git a/partition/roles/metal-core/templates/metal-core-env.j2 b/partition/roles/metal-core/templates/metal-core-env.j2
@@ -28,3 +28,4 @@ METAL_CORE_SPINE_UPLINKS: "{{ metal_core_spine_uplinks | join(',') }}"
 {% endif %}
 METAL_CORE_INTERFACES_TPL_FILE: "{{ metal_core_interfaces_tpl_file }}"
 METAL_CORE_FRR_TPL_FILE: "{{ metal_core_frr_tpl_file }}"
+METAL_CORE_PXE_VLAN_ID: "{{ metal_core_pxe_vlan_id }}"
Original file line number	Diff line number	Diff line change
Expand Up		@@ -20,3 +20,5 @@ metal_core_consider_hosts_file_resolution: false

		metal_core_interfaces_tpl_file: ""
		metal_core_frr_tpl_file: ""

		metal_core_pxe_vlan_id: 4000