Diffstat (limited to 'teams/eln/cloud.xml')
| -rw-r--r-- | teams/eln/cloud.xml | 83 |
1 files changed, 72 insertions, 11 deletions
diff --git a/teams/eln/cloud.xml b/teams/eln/cloud.xml index 090b7b5..b146d48 100644 --- a/teams/eln/cloud.xml +++ b/teams/eln/cloud.xml @@ -28,12 +28,12 @@ <requires profile="Cloud-Base-Generic"/> </profile> </profiles> - <preferences profiles="Cloud-Base-Azure" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="x86_64"> <type image="oem" format="vhd-fixed" formatoptions="force_size" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 earlyprintk=ttyS0 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -43,12 +43,27 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-Azure" arch="aarch64"> + <type image="oem" format="vhd-fixed" formatoptions="force_size" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 earlyprintk=ttyAMA0 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-AmazonEC2" arch="x86_64"> <type image="oem" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" timeout="0"/> @@ -58,12 +73,27 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-GCE" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-AmazonEC2" arch="aarch64"> + <type image="oem" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-GCE" arch="x86_64"> <type image="oem" format="gce" filesystem="xfs" kernelcmdline="no_timer_check console=ttyS0,38400n8d systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" timeout="0"/> @@ -74,12 +104,43 @@ </oemconfig> </type> </preferences> - <preferences profiles="Cloud-Base-Generic" arch="x86_64,aarch64"> + <preferences profiles="Cloud-Base-GCE" arch="aarch64"> + <type image="oem" format="gce" + filesystem="xfs" + kernelcmdline="no_timer_check console=ttyAMA0,38400n8d systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" timeout="0"/> + <!-- GCP engineers have told us the disk images have bad performance if they are anything less than 10G --> + <size unit="G">10</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Generic" arch="x86_64"> <type image="oem" format="qcow2" filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" + rootfs_label="fedora" + > + <bootloader name="grub2" bls="true" console="serial" timeout="0"/> + <size unit="G">5</size> + <oemconfig> + <oem-resize>false</oem-resize> + </oemconfig> + </type> + </preferences> + <preferences profiles="Cloud-Base-Generic" arch="aarch64"> + <type image="oem" format="qcow2" + filesystem="xfs" + kernelcmdline="no_timer_check console=tty1 console=ttyAMA0,115200n8 systemd.firstboot=off" + devicepersistency="by-uuid" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" efipartsize="100" firmware="uefi" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -94,7 +155,7 @@ filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" firmware="ofw" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" firmware="ofw" rootfs_label="fedora" > <bootloader name="grub2" bls="true" console="serial" timeout="0"/> @@ -109,7 +170,7 @@ filesystem="xfs" kernelcmdline="no_timer_check console=tty1 console=ttyS0,115200n8 systemd.firstboot=off" devicepersistency="by-uuid" - bootpartition="true" bootpartsize="1000" bootfilesystem="xfs" + bootpartition="true" bootpartsize="2000" bootfilesystem="xfs" rootfs_label="fedora" > <bootloader name="zipl" timeout="1"/> @@ -138,7 +199,7 @@ </type> </preferences> <packages type="bootstrap" patternType="plusRecommended" profiles="CloudCore,CloudCoreUKI"> - <package name="fedora-release-eln"/> + <package name="fedora-eln-release"/> </packages> <packages type="image" patternType="plusRecommended" profiles="CloudCore"> <namedCollection name="cloud-server-environment"/> |