Skip to content

Commit 99840f3

Browse files
diconico07hardys
authored andcommitted
Update for SL Micro 6.2
- Align all uses of version-sl-micro to version-operatingsystem - Bump version-operatingsystem to 6.2 - Remove `net.ifnames=1` parameters as they are now default - Remove `net.ifnames=0` paremeters as they were unintended leftovers - Adapt comments Predictable Naming Scheme for Network Interfaces to highlight the new default - Add comments about the need for extra non root user for cockpit use Signed-off-by: Nicolas Belouin <nicolas.belouin@suse.com>
1 parent 134763b commit 99840f3

File tree

11 files changed

+48
-44
lines changed

11 files changed

+48
-44
lines changed

asciidoc/components/linux-micro.adoc

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,9 @@ SUSE Edge uses the <<components-eib,Edge Image Builder>> to preconfigure the SUS
3838
SUSE Linux Micro comes with Cockpit to allow the local management of the host through a Web application.
3939

4040
This service is disabled by default but can be started by enabling the systemd service `cockpit.socket`.
41+
As cockpit forbids root login by default, the creation of a user with administrative privileges is recommended, refer to the {link-micro-official-docs}[SUSE Linux Micro official documentation] for more information.
42+
43+
4144

4245
== Known issues
4346

asciidoc/components/longhorn.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ SUSE Storage is a lightweight, reliable, and user-friendly distributed block sto
2020

2121
If you are following this guide, it assumes that you have the following already available:
2222

23-
* At least one host with SUSE Linux Micro {version-sl-micro} installed; this can be physical or virtual
23+
* At least one host with SUSE Linux Micro {version-operatingsystem} installed; this can be physical or virtual
2424
* A Kubernetes cluster installed; either K3s or RKE2
2525
* Helm
2626

asciidoc/edge-book/version-matrix.adoc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ endif::[]
1818
[options="header"]
1919
|======
2020
| Name | Version | Chart Version
21-
| SUSE Linux Micro | {version-sl-micro} | N/A
21+
| SUSE Linux Micro | {version-operatingsystem} | N/A
2222
| Rancher Prime | {version-rancher-prime} | {version-rancher-prime}
2323
| Fleet | {version-fleet} | {version-fleet-chart}
2424
| K3s | {version-kubernetes-k3s} | N/A

asciidoc/edge-book/versions.adoc

Lines changed: 17 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -13,14 +13,6 @@
1313
:version-edge: 3.4
1414
:version-edge-registry: 3.4
1515

16-
// == SUSE Linux Micro ==
17-
:micro-base-image-raw: SL-Micro.x86_64-6.1-Base-GM.raw
18-
:micro-base-rt-image-raw: SL-Micro.x86_64-6.1-Base-RT-GM.raw
19-
:micro-base-rt-image-iso: SL-Micro.x86_64-6.1-Base-RT-SelfInstall-GM.install.iso
20-
:micro-base-image-iso: SL-Micro.x86_64-6.1-Base-SelfInstall-GM.install.iso
21-
:micro-default-image-iso: SL-Micro.x86_64-6.1-Default-SelfInstall-GM.install.iso
22-
:version-sl-micro: 6.1
23-
2416
// == Multi-Linux Manager ==
2517
:version-mlm: 5.0.5
2618

@@ -75,7 +67,7 @@
7567
:version-kubernetes-k3s: v1.33.3+k3s1
7668
:version-kubernetes-rke2: v1.33.3+rke2r1
7769

78-
:version-operatingsystem: 6.1
70+
:version-operatingsystem: 6.2
7971

8072
:version-akri-chart: 304.0.0+up0.12.20
8173
:version-akri-dashboard-extension-chart: 304.0.2+up1.3.1
@@ -105,6 +97,22 @@
10597
// https://doc.crds.dev/github.com/metal3-io/cluster-api-provider-metal3/infrastructure.cluster.x-k8s.io/Metal3MachineTemplate/v1beta1@v1.11.0#spec-template-spec-hostSelector-matchLabels
10698
:version-capi-provider-metal3: v1beta1@v1.10.2
10799

100+
// ============================================================================
101+
// Derived Version Entries
102+
//
103+
// The following are derived from previously defined versions, ensure they
104+
// are not using elements defined below them
105+
//
106+
// ============================================================================
107+
108+
// == SUSE Linux Micro ==
109+
:micro-base-image-raw: SL-Micro.x86_64-{version-operatingsystem}-Base-GM.raw
110+
:micro-base-rt-image-raw: SL-Micro.x86_64-{version-operatingsystem}-Base-RT-GM.raw
111+
:micro-base-rt-image-iso: SL-Micro.x86_64-{version-operatingsystem}-Base-RT-SelfInstall-GM.install.iso
112+
:micro-base-image-iso: SL-Micro.x86_64-{version-operatingsystem}-Base-SelfInstall-GM.install.iso
113+
:micro-default-image-iso: SL-Micro.x86_64-{version-operatingsystem}-Default-SelfInstall-GM.install.iso
114+
115+
108116
// ============================================================================
109117
// Manual Version Entries
110118
//

asciidoc/guides/kiwi-builder-images.adoc

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,23 @@ This process makes use of https://osinside.github.io/kiwi/[Kiwi] to run the imag
2424
* "*Default*" - A SUSE Linux Micro disk image based on the "Base" above but with a few more tools, including the virtualization stack, Cockpit and salt-minion.
2525
* "*Default-SelfInstall*" - A SelfInstall image based on the "Default" above
2626
27-
See https://documentation.suse.com/sle-micro/{version-sl-micro}/html/Micro-deployment-images/index.html#alp-images-installer-type[SUSE Linux Micro {version-sl-micro}] documentation for more details.
27+
See https://documentation.suse.com/sle-micro/{version-operatingsystem}/html/Micro-deployment-images/index.html#alp-images-installer-type[SUSE Linux Micro {version-operatingsystem}] documentation for more details.
2828

2929
NOTE: This process works for both {x86-64} and {aarch64} architectures but it is necessary to use a build host with the same architecture of the images being built. In other words, to build an {aarch64} image, it is required to use an {aarch64} build host, and vice-versa for {x86-64} - cross-builds are not supported at this time.
3030

3131
== Prerequisites
3232

3333
Kiwi image builder requires the following:
3434

35-
* A SUSE Linux Micro {version-sl-micro} host ("build system") with the same architecture of the image being built.
35+
* A SUSE Linux Micro {version-operatingsystem} host ("build system") with the same architecture of the image being built.
3636
* The build system needs to be already registered via `SUSEConnect` (the registration is used to pull the latest packages from the SUSE repositories)
3737
* An internet connection that can be used to pull the required packages. If connected via proxy, the build host needs to be pre-configured.
3838
* SELinux needs to be disabled on the build host (as SELinux labelling takes place in the container and it can conflict with the host policy)
3939
* At least 10GB free disk space to accommodate the container image, the build root, and the resulting output image(s)
4040

4141
== Getting Started
4242

43-
Due to certain limitations, it is currently required to disable SELinux. Connect to the SUSE Linux Micro {version-sl-micro} image build host and ensure SELinux is disabled:
43+
Due to certain limitations, it is currently required to disable SELinux. Connect to the SUSE Linux Micro {version-operatingsystem} image build host and ensure SELinux is disabled:
4444

4545
[,console]
4646
----
@@ -88,10 +88,10 @@ After a few minutes the images can be found in the local output directory:
8888
INFO: Image build successful, generated images are available in the 'output' directory.
8989
9090
# ls -1 output/
91-
SLE-Micro.x86_64-{version-sl-micro}.changes
92-
SLE-Micro.x86_64-{version-sl-micro}.packages
93-
SLE-Micro.x86_64-{version-sl-micro}.raw
94-
SLE-Micro.x86_64-{version-sl-micro}.verified
91+
SLE-Micro.x86_64-{version-operatingsystem}.changes
92+
SLE-Micro.x86_64-{version-operatingsystem}.packages
93+
SLE-Micro.x86_64-{version-operatingsystem}.raw
94+
SLE-Micro.x86_64-{version-operatingsystem}.verified
9595
build
9696
kiwi.result
9797
kiwi.result.json

asciidoc/product/atip-automated-provision.adoc

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,6 @@ image:
123123
operatingSystem:
124124
kernelArgs:
125125
- ignition.platform.id=openstack
126-
- net.ifnames=1
127126
systemd:
128127
disable:
129128
- rebootmgr
@@ -152,11 +151,7 @@ For the production environments, it is recommended to use the SSH keys that can
152151
====
153152
`arch: x86_64` is the architecture of the image. For arm64 architecture, use `arch: aarch64`.
154153
155-
`net.ifnames=1` enables https://documentation.suse.com/smart/network/html/network-interface-predictable-naming/index.html[Predictable Network Interface Naming]
156-
157-
This matches the default configuration for the metal3 chart, but the setting must match the configured chart `predictableNicNames` value.
158-
159-
Also note `ignition.platform.id=openstack` is mandatory, without this argument SLEMicro configuration via ignition will fail in the Metal^3^ automated flow.
154+
Note `ignition.platform.id=openstack` is mandatory, without this argument SLEMicro configuration via ignition will fail in the Metal^3^ automated flow.
160155
====
161156

162157
[#add-custom-script-growfs]
@@ -240,7 +235,6 @@ image:
240235
operatingSystem:
241236
kernelArgs:
242237
- ignition.platform.id=openstack
243-
- net.ifnames=1
244238
systemd:
245239
disable:
246240
- rebootmgr

asciidoc/product/atip-features.adoc

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -123,14 +123,14 @@ This provides an example of kernel arguments for a 32-core Intel server, includi
123123
[,shell]
124124
----
125125
$ cat /proc/cmdline
126-
BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=77b713de-5cc7-4d4c-8fc6-f5eca0a43cf9 skew_tick=1 rd.timeout=60 rd.retry=45 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack intel_iommu=on iommu=pt irqaffinity=0,31,32,63 isolcpus=domain,nohz,managed_irq,1-30,33-62 nohz_full=1-30,33-62 nohz=on mce=off net.ifnames=0 nosoftlockup nowatchdog nmi_watchdog=0 quiet rcu_nocb_poll rcu_nocbs=1-30,33-62 rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll
126+
BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=77b713de-5cc7-4d4c-8fc6-f5eca0a43cf9 skew_tick=1 rd.timeout=60 rd.retry=45 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack intel_iommu=on iommu=pt irqaffinity=0,31,32,63 isolcpus=domain,nohz,managed_irq,1-30,33-62 nohz_full=1-30,33-62 nohz=on mce=off nosoftlockup nowatchdog nmi_watchdog=0 quiet rcu_nocb_poll rcu_nocbs=1-30,33-62 rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll
127127
----
128128

129129
Here is another configuration example for a 64-core AMD server. Among the 128 logical processors (`0-127`), first 8 cores (`0-7`) are designated for housekeeping, while the remaining 120 cores (`8-127`) are pinned for the applications:
130130
[,shell]
131131
----
132132
$ cat /proc/cmdline
133-
BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=575291cf-74e8-42cf-8f2c-408a20dc00b8 skew_tick=1 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack amd_iommu=on iommu=pt irqaffinity=0-7 isolcpus=domain,nohz,managed_irq,8-127 nohz_full=8-127 rcu_nocbs=8-127 mce=off nohz=on net.ifnames=0 nowatchdog nmi_watchdog=0 nosoftlockup quiet rcu_nocb_poll rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll
133+
BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=575291cf-74e8-42cf-8f2c-408a20dc00b8 skew_tick=1 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack amd_iommu=on iommu=pt irqaffinity=0-7 isolcpus=domain,nohz,managed_irq,8-127 nohz_full=8-127 rcu_nocbs=8-127 mce=off nohz=on nowatchdog nmi_watchdog=0 nosoftlockup quiet rcu_nocb_poll rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll
134134
----
135135

136136
[#cpu-pinning-host]
@@ -209,7 +209,7 @@ Edit the `/etc/default/grub` file with above parameters and the file will look l
209209

210210
[,shell]
211211
----
212-
GRUB_CMDLINE_LINUX="BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=77b713de-5cc7-4d4c-8fc6-f5eca0a43cf9 skew_tick=1 rd.timeout=60 rd.retry=45 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack intel_iommu=on iommu=pt irqaffinity=0,31,32,63 isolcpus=domain,nohz,managed_irq,1-30,33-62 nohz_full=1-30,33-62 nohz=on mce=off net.ifnames=0 nosoftlockup nowatchdog nmi_watchdog=0 quiet rcu_nocb_poll rcu_nocbs=1-30,33-62 rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll"
212+
GRUB_CMDLINE_LINUX="BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=77b713de-5cc7-4d4c-8fc6-f5eca0a43cf9 skew_tick=1 rd.timeout=60 rd.retry=45 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack intel_iommu=on iommu=pt irqaffinity=0,31,32,63 isolcpus=domain,nohz,managed_irq,1-30,33-62 nohz_full=1-30,33-62 nohz=on mce=off nosoftlockup nowatchdog nmi_watchdog=0 quiet rcu_nocb_poll rcu_nocbs=1-30,33-62 rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll"
213213
----
214214

215215
Update the GRUB configuration:
@@ -1206,7 +1206,7 @@ To enable the parameters, add them to the `/etc/default/grub` file:
12061206

12071207
[,shell]
12081208
----
1209-
GRUB_CMDLINE_LINUX="BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=77b713de-5cc7-4d4c-8fc6-f5eca0a43cf9 skew_tick=1 rd.timeout=60 rd.retry=45 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack intel_iommu=on iommu=pt irqaffinity=0,31,32,63 isolcpus=domain,nohz,managed_irq,1-30,33-62 nohz_full=1-30,33-62 nohz=on mce=off net.ifnames=0 nosoftlockup nowatchdog nmi_watchdog=0 quiet rcu_nocb_poll rcu_nocbs=1-30,33-62 rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll"
1209+
GRUB_CMDLINE_LINUX="BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=77b713de-5cc7-4d4c-8fc6-f5eca0a43cf9 skew_tick=1 rd.timeout=60 rd.retry=45 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack intel_iommu=on iommu=pt irqaffinity=0,31,32,63 isolcpus=domain,nohz,managed_irq,1-30,33-62 nohz_full=1-30,33-62 nohz=on mce=off nosoftlockup nowatchdog nmi_watchdog=0 quiet rcu_nocb_poll rcu_nocbs=1-30,33-62 rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll"
12101210
----
12111211

12121212
Update the GRUB configuration and reboot the system to apply the changes:
@@ -1300,7 +1300,7 @@ Modify the GRUB file `/etc/default/grub` to add them to the kernel command line:
13001300

13011301
[,shell]
13021302
----
1303-
GRUB_CMDLINE_LINUX="BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=77b713de-5cc7-4d4c-8fc6-f5eca0a43cf9 skew_tick=1 rd.timeout=60 rd.retry=45 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack intel_iommu=on iommu=pt irqaffinity=0,31,32,63 isolcpus=domain,nohz,managed_irq,1-30,33-62 nohz_full=1-30,33-62 nohz=on mce=off net.ifnames=0 nosoftlockup nowatchdog nmi_watchdog=0 quiet rcu_nocb_poll rcu_nocbs=1-30,33-62 rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll"
1303+
GRUB_CMDLINE_LINUX="BOOT_IMAGE=/boot/vmlinuz-6.4.0-9-rt root=UUID=77b713de-5cc7-4d4c-8fc6-f5eca0a43cf9 skew_tick=1 rd.timeout=60 rd.retry=45 console=ttyS1,115200 console=tty0 default_hugepagesz=1G hugepagesz=1G hugepages=40 hugepagesz=2M hugepages=0 ignition.platform.id=openstack intel_iommu=on iommu=pt irqaffinity=0,31,32,63 isolcpus=domain,nohz,managed_irq,1-30,33-62 nohz_full=1-30,33-62 nohz=on mce=off nosoftlockup nowatchdog nmi_watchdog=0 quiet rcu_nocb_poll rcu_nocbs=1-30,33-62 rcupdate.rcu_cpu_stall_suppress=1 rcupdate.rcu_expedited=1 rcupdate.rcu_normal_after_boot=1 rcupdate.rcu_task_stall_timeout=0 rcutree.kthread_prio=99 security=selinux selinux=1 idle=poll"
13041304
----
13051305

13061306
Update the GRUB configuration and reboot the system to apply the changes:
@@ -1711,7 +1711,6 @@ operatingSystem:
17111711
timezone: America/New_York
17121712
kernelArgs:
17131713
- ignition.platform.id=openstack
1714-
- net.ifnames=1
17151714
systemd:
17161715
disable:
17171716
- rebootmgr

asciidoc/quickstart/eib.adoc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,14 @@ For more information, read the <<components-eib,Edge Image Builder Introduction>
2424

2525
[WARNING]
2626
====
27-
Edge Image Builder {version-eib} supports customizing SUSE Linux Micro {version-sl-micro} images.
27+
Edge Image Builder {version-eib} supports customizing SUSE Linux Micro {version-operatingsystem} images.
2828
Older versions, such as SUSE Linux Enterprise Micro 5.5, or 6.0 are not supported.
2929
====
3030

3131
== Prerequisites
3232
* An {x86-64} build host machine (physical or virtual) running SLES 15 SP6.
3333
* The Podman container engine
34-
* A SUSE Linux Micro {version-sl-micro} SelfInstall ISO image created using the <<guides-kiwi-builder-images,Kiwi Builder procedure>>
34+
* A SUSE Linux Micro {version-operatingsystem} SelfInstall ISO image created using the <<guides-kiwi-builder-images,Kiwi Builder procedure>>
3535

3636
[NOTE]
3737
====

asciidoc/quickstart/metal3.adoc

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -231,7 +231,6 @@ operatingSystem:
231231
- 10.0.0.2
232232
kernelArgs:
233233
- ignition.platform.id=openstack
234-
- net.ifnames=1
235234
systemd:
236235
disable:
237236
- rebootmgr
@@ -256,11 +255,7 @@ For the production environments, it is recommended to use the SSH keys that can
256255

257256
[NOTE]
258257
====
259-
`net.ifnames=1` enables https://documentation.suse.com/smart/network/html/network-interface-predictable-naming/index.html[Predictable Network Interface Naming]
260-
261-
This matches the default configuration for the Metal^3^ chart, but the setting must match the configured chart `predictableNicNames` value.
262-
263-
Also note that `ignition.platform.id=openstack` is mandatory - without this argument SUSE Linux Micro configuration via ignition will fail in the Metal^3^ automated flow.
258+
Note that `ignition.platform.id=openstack` is mandatory - without this argument SUSE Linux Micro configuration via ignition will fail in the Metal^3^ automated flow.
264259
265260
The `time` section is optional but it is highly recommended to be configured to avoid potential issues with certificates and clock skew. The values provided in this example are for illustrative purposes only. Please adjust them to fit your specific requirements.
266261
====

0 commit comments

Comments
 (0)