diff --git a/README_ADVANCED.md b/README_ADVANCED.md index 6b933b3d0..210c594de 100644 --- a/README_ADVANCED.md +++ b/README_ADVANCED.md @@ -9,17 +9,17 @@ Some modules have a `product_version` variable that determines the software prod Legal values for released software are: -- `4.2-released` (latest released maintenance update for SUSE Manager 4.2 and Tools) - `4.3-released` (latest released maintenance update for SUSE Manager 4.3 and Tools) - `4.3-VM-released` (latest released maintenance update for SUSE Manager 4.3 virtual machine) +- `5.0-released` (latest released maintenance update for SUSE Manager 5.0 and Tools) - `uyuni-released` (latest released version for Uyuni Server, Proxy and Tools, from systemsmanagement:Uyuni:Stable) Legal values for work-in-progress software are: -- `4.2-nightly` (corresponds to the Build Service project Devel:Galaxy:Manager:4.2) - `4.3-nightly` (corresponds to the Build Service project Devel:Galaxy:Manager:4.3) - `4.3-VM-nightly` (corresponds to the VM image in the Build Service project Devel:Galaxy:Manager:4.3) - `4.3-beta` (corresponds to the Build Service project SUSE:SLE-15-SP4:Update:Products:Manager43) +- `5.0-nightly` (corresponds to the Build Service project Devel:Galaxy:Manager:5.0) - `head` (corresponds to the Build Service project Devel:Galaxy:Manager:Head, uses SLE Micro as the base image for server) - `uyuni-master` (corresponds to the Build Service project systemsmanagement:Uyuni:Master, for `server` and `proxy` only works with openSUSE Leap image) @@ -46,10 +46,10 @@ module "suse-minion" { source = "./modules/minion" base_configuration = module.base.configuration - name = "min-sles15sp1" - image = "sles15sp1o" + name = "min-sles15sp6" + image = "sles15sp6o" server_configuration = module.proxy.configuration - product_version = "4.2-nightly" + product_version = "5.0-nightly" } module "server" { @@ -57,7 +57,7 @@ module "server" { base_configuration = module.base.configuration name = "server" - product_version = "4.2-released" + product_version = "5.0-released" } ``` @@ -69,7 +69,7 @@ For some modules like `minion`, `image` is mandatory and Terraform will refuse t For other modules like `server` there is a default selection if nothing is specified. Please note that not all OS combinations might be supported, refer to official documentation to select a compatible OS. -The following example creates a SUSE Manager server using "nightly" packages from version 4.2 based on SLES 15 SP3: +The following example creates a SUSE Manager server using "nightly" packages from version 5.0 based on SLES 15 SP3: ```hcl module "server" { @@ -78,7 +78,7 @@ module "server" { image = "sles15sp3o" name = "server" - product_version = "4.2-nightly" + product_version = "5.0-nightly" } ``` @@ -209,7 +209,7 @@ module "virthost" { server_configuration = module.srv.configuration ... name = "min-kvm" - image = "sles15sp1o" + image = "sles15sp6o" ... provider_settings = { vcpu = 3 @@ -311,7 +311,7 @@ module "server" { base_configuration = module.base.configuration name = "server" - product_version = "4.2-nightly" + product_version = "5.0-nightly" channels = ["sles12-sp5-pool-x86_64"] } ``` @@ -337,11 +337,11 @@ module "server" { base_configuration = module.base.configuration name = "server" - product_version = "4.2-nightly" - channels = ["sles12-sp3-pool-x86_64", "sles12-sp3-updates-x86_64"] + product_version = "5.0-nightly" + channels = ["sles15-sp3-pool-x86_64", "sles15-sp3-updates-x86_64"] wait_for_reposync = true cloned_channels = [ - { channels = ["sles12-sp3-pool-x86_64", "sles12-sp3-updates-x86_64"], + { channels = ["sles15-sp3-pool-x86_64", "sles15-sp3-updates-x86_64"], prefix = "cloned-2017-q3", date = "2017-09-30" } @@ -547,7 +547,7 @@ module "proxy" { base_configuration = module.base.configuration name = "proxy" - product_version = "4.2-nightly" + product_version = "5.0-nightly" server_configuration = module.server.configuration minion = false @@ -672,7 +672,7 @@ module "server" { base_configuration = module.base.configuration name = "server" - product_version = "4.2-nightly" + product_version = "5.0-nightly" smt = "http://smt.suse.de" } ``` @@ -788,7 +788,7 @@ module "minion" { base_configuration = module.base.configuration name = "minion" - image = "sles15sp1o" + image = "sles15sp6o" server_configuration = module.server.configuration evil_minion_count = 10 evil_minion_slowdown_factor = 1 @@ -911,7 +911,7 @@ An example follows: module "server" { source = "./modules/server" base_configuration = module.base.configuration - product_version = "4.2-nightly" + product_version = "5.0-nightly" name = "server" repository_disk_size = 500 database_disk_size = 50 diff --git a/backend_modules/azure/host/user_data.yaml b/backend_modules/azure/host/user_data.yaml index c973c829a..8e7f3c1f2 100644 --- a/backend_modules/azure/host/user_data.yaml +++ b/backend_modules/azure/host/user_data.yaml @@ -40,31 +40,6 @@ runcmd: %{ endif } -%{ if image == "sles15"} -zypper: - repos: - - id: os_pool_repo - name: os_pool_repo - baseurl: http://${mirror_url}/SUSE/Products/SLE-Module-Basesystem/15-SP1/x86_64/product - enabled: 1 - autorefresh: 1 - -packages: ["salt-minion"] -%{ endif } - -%{ if image == "sles15sp1o" } -zypper: - repos: - - id: salt_qubes_build - name: salt_qubes_build - baseurl: https://download.opensuse.org/repositories/home:/wicked:/qubes-build/SLE_15_SP1/ - enabled: 1 - autorefresh: 1 - -packages: ["salt-minion"] - -%{ endif } - %{ if image == "sles15sp2o" } zypper: repos: @@ -130,32 +105,6 @@ packages: ["salt-minion"] %{ endif } -%{ if image == "sles12sp3"} -zypper: - repos: - - id: os_manager_tools - name: os_manager_tools - baseurl: http://${mirror_url}/SUSE/Updates/SLE-Manager-Tools/12/x86_64/update - enabled: 1 - autorefresh: 1 - - id: os_pool_repo - name: os_pool_repo - baseurl: http://${mirror_url}/SUSE/Products/SLE-SERVER/12-SP3/x86_64/product/ - enabled: 1 - autorefresh: 1 - -packages: ["salt-minion"] -%{ endif } -%{ if image == "sles11sp4"} -# WORKAROUND: SLES 11 SP4 does not ship with Salt installed -runcmd: - - zypper ar http://${mirror_url}/repo/\$RCE/SLES11-SP4-SUSE-Manager-Tools/sle-11-x86_64/ tools_pool_repo - - zypper ar http://${mirror_url}/repo/\$RCE/SLES11-SP4-Pool/sle-11-x86_64/ os_pool_repo - - zypper ref - - zypper in -y salt-minion - - zypper removerepo --all - - rm /etc/modprobe.d/50-ipv6.conf -%{ endif } %{ if image == "rhel9"} yum_repos: # repo for salt diff --git a/backend_modules/libvirt/base/main.tf b/backend_modules/libvirt/base/main.tf index 7e507a593..dd9adec1b 100644 --- a/backend_modules/libvirt/base/main.tf +++ b/backend_modules/libvirt/base/main.tf @@ -20,25 +20,15 @@ locals { opensuse154armo = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.4/appliances/openSUSE-Leap-15.4-ARM-JeOS-efi.aarch64.qcow2" opensuse155armo = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.5/appliances/openSUSE-Leap-15.5-Minimal-VM.aarch64-Cloud.qcow2" opensuse156armo = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap/15.6/appliances/openSUSE-Leap-15.6-Minimal-VM.aarch64-Cloud.qcow2" - sles15 = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles15.x86_64.qcow2" - sles15o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/install/SLE-15-JeOS-GM/SLES15-JeOS.x86_64-15.0-OpenStack-Cloud-GM.qcow2" - sles15sp1 = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles15sp1.x86_64.qcow2" - sles15sp1o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/install/SLE-15-SP1-JeOS-QU4/SLES15-SP1-JeOS.x86_64-15.1-OpenStack-Cloud-QU4.qcow2" sles15sp2 = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles15sp2.x86_64.qcow2" sles15sp2o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/install/SLE-15-SP2-JeOS-GM/SLES15-SP2-JeOS.x86_64-15.2-OpenStack-Cloud-GM.qcow2" sles15sp3o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/install/SLE-15-SP3-JeOS-GM/SLES15-SP3-JeOS.x86_64-15.3-OpenStack-Cloud-GM.qcow2" sles15sp4o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/install/SLE-15-SP4-Minimal-GM/SLES15-SP4-Minimal-VM.x86_64-OpenStack-Cloud-GM.qcow2" sles15sp5o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/install/SLE-15-SP5-Minimal-GM/SLES15-SP5-Minimal-VM.x86_64-Cloud-GM.qcow2" sles15sp6o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/install/SLE-15-SP6-Minimal-GM/SLES15-SP6-Minimal-VM.x86_64-Cloud-GM.qcow2" - sles11sp4 = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles11sp4.x86_64.qcow2" - sles12sp3 = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles12sp3.x86_64.qcow2" - sles12sp4 = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles12sp4.x86_64.qcow2" - sles12sp4o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://schnell.suse.de"}/SLE12/SLE-12-SP4-JeOS-GM/SLES12-SP4-JeOS.x86_64-12.4-OpenStack-Cloud-GM.qcow2" sles12sp5o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/install/SLE-12-SP5-JeOS-GM/SLES12-SP5-JeOS.x86_64-12.5-OpenStack-Cloud-GM.qcow2" - ubuntu1604o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud-images.ubuntu.com"}/xenial/current/xenial-server-cloudimg-amd64-disk1.img" ubuntu2004o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud-images.ubuntu.com"}/focal/current/focal-server-cloudimg-amd64.img" ubuntu2204o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud-images.ubuntu.com"}/jammy/current/jammy-server-cloudimg-amd64.img" - debian10o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud.debian.org"}/images/cloud/OpenStack/current-10/debian-10-openstack-amd64.qcow2" debian11o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud.debian.org"}/images/cloud/bullseye/latest/debian-11-genericcloud-amd64.qcow2" debian12o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud.debian.org"}/images/cloud/bookworm/latest/debian-12-genericcloud-amd64.qcow2" opensuse154-ci-pro = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/libvirt/images/opensuse154-ci-pr.x86_64.qcow2" diff --git a/backend_modules/libvirt/host/user_data.yaml b/backend_modules/libvirt/host/user_data.yaml index fc1751e60..d3266336c 100644 --- a/backend_modules/libvirt/host/user_data.yaml +++ b/backend_modules/libvirt/host/user_data.yaml @@ -153,27 +153,6 @@ runcmd: - zypper removerepo --all %{ endif } -%{ if image == "sles12sp4o" } -zypper: - repos: - - id: os_pool_repo - name: os_pool_repo - baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/SUSE/Products/SLE-SERVER/12-SP4/x86_64/product/ - enabled: 1 - autorefresh: 1 - - id: tools_pool_repo - baseurl: http://${ use_mirror_images ? mirror : "download.opensuse.org"}/repositories/systemsmanagement:/Uyuni:/Stable:/SLE12-Uyuni-Client-Tools/SLE_12/ - enabled: true - gpgcheck: false - name: tools_pool_repo - -%{ if install_salt_bundle } -packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"] -%{ else } -packages: ["avahi", "nss-mdns", "qemu-guest-agent"] -%{ endif } -%{ endif } - %{ if image == "sles12sp5o" } zypper: repos: @@ -195,67 +174,6 @@ packages: ["avahi", "nss-mdns", "qemu-guest-agent"] %{ endif } %{ endif } -%{ if image == "sles15o" } -zypper: - repos: - - id: os_pool_repo - name: os_pool_repo - baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/SUSE/Products/SLE-Module-Basesystem/15/x86_64/product - enabled: 1 - autorefresh: 1 - ## WORKAROUND: name of server app repo needs to be alphabetically after the base system repo to force GPG key update - - id: server_applications_pool_repo - name: module_server_applications_pool_repo - baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/SUSE/Products/SLE-Module-Server-Applications/15/x86_64/product - enabled: 1 - autorefresh: 1 - - id: tools_pool_repo - baseurl: http://${ use_mirror_images ? mirror : "download.opensuse.org"}/repositories/systemsmanagement:/Uyuni:/Stable:/SLE15-Uyuni-Client-Tools/SLE_15/ - enabled: true - gpgcheck: false - name: tools_pool_repo - -%{ if install_salt_bundle } -packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"] -%{ else } -packages: ["avahi", "nss-mdns", "qemu-guest-agent"] -%{ endif } - -runcmd: - # WORKAROUND: cloud-init in SLES 15 does not take care of the following - - "systemctl start 'qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0'" -%{ endif } - -%{ if image == "sles15sp1o" } -zypper: - repos: - - id: os_pool_repo - name: os_pool_repo - baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/SUSE/Products/SLE-Module-Basesystem/15-SP1/x86_64/product - enabled: 1 - autorefresh: 1 - - id: module_server_applications_pool_repo - name: module_server_applications_pool_repo - baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/SUSE/Products/SLE-Module-Server-Applications/15-SP1/x86_64/product - enabled: 1 - autorefresh: 1 - - id: tools_pool_repo - baseurl: http://${ use_mirror_images ? mirror : "download.opensuse.org"}/repositories/systemsmanagement:/Uyuni:/Stable:/SLE15-Uyuni-Client-Tools/SLE_15/ - enabled: true - gpgcheck: false - name: tools_pool_repo - -%{ if install_salt_bundle } -packages: ["venv-salt-minion", "avahi", "nss-mdns", "qemu-guest-agent"] -%{ else } -packages: ["avahi", "nss-mdns", "qemu-guest-agent"] -%{ endif } - -runcmd: - # WORKAROUND: cloud-init in SLES 15 SP1 does not take care of the following - - "systemctl start 'qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0'" -%{ endif } - %{ if image == "sles15sp2o" } zypper: repos: @@ -651,53 +569,6 @@ packages: ["venv-salt-minion", "avahi-daemon", "qemu-guest-agent", "gnupg", "pyt packages: ["salt-minion", "avahi-daemon", "qemu-guest-agent", "gnupg", "python3-apt"] %{ endif } %{ endif } -%{ if image == "debian10o" } -apt: - sources: - tools_pool_repo: - source: deb http://${ use_mirror_images ? mirror : "download.opensuse.org"}/repositories/systemsmanagement:/Uyuni:/Stable:/Debian10-Uyuni-Client-Tools/Debian_10/ / - key: | - -----BEGIN PGP PUBLIC KEY BLOCK----- - Version: GnuPG v1.4.5 (GNU/Linux) - - mQENBFsnulUBCADNjL4hvhVtSzqVDlMtFFFP28Acq+UNF8WKKMhbBirfOpXwwI1C - NR3i0CXPOce5eKShuuWAjD2E36e2XAp3rUAo/aCA7UgtJkMNKzzlTOcqHHxKTx6H - gvp0Fb6xTKywZ7VttGhwUynl+CsDuOst3ROXTNdb8XMfm4joH2FW5D3ACN2qNiv0 - MVcFNKxQ98w8M9xJxdI8DuyngnSeZwAosNzEio3JhTPiTv9ngY2Z3AuYUcwTEt7o - feEN+ivAgYnn+a6DBKFBeCW7VUD3V+tH8/fKnkvI4gf2o3N7Ok+/uE+DPUBb+14f - +9dhBjd+7+pR3ayEZFjQns5XFShoYu2+CQspABEBAAG0UHN5c3RlbXNtYW5hZ2Vt - ZW50OlV5dW5pIE9CUyBQcm9qZWN0IDxzeXN0ZW1zbWFuYWdlbWVudDpVeXVuaUBi - dWlsZC5vcGVuc3VzZS5vcmc+iQE+BBMBCAAoBQJjQDEEAhsDBQkMNyavBgsJCAcD - AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCXLl1sDSCDPjsSCAC1v9YHwuP0kRt8VPlq - /RLgADb5TsUPOaDcZ/maKVxhL5EgY2mX1ViCO4Bm+VFL2ZSJEXth8/Zp/dZe80e9 - tlZgag5uPQe9FV0IAHXYt91DYJlE7VuxvdhADIt9RcDmS4OrSAfQoroyh5OW3ZRW - Kqa68L6RBhiyuvBTaRCUdIhqDBjVCgMlLJxC5soOIVCEvMRzOxHqO0+gvKomvM1P - iK4cio2OcIqZb8vCyMIXtYniHqA0rUZD4U+EB9enmYcj9ZhWO9oQXZ0qCQN6ve/K - 1Q7NjImT5oEHWGFeLmwWZMe2+djFcHiCQM1bFN1gC+2ASz5XPC7OKdrIi+E85gMo - cYu+iEYEExECAAYFAlsnulUACgkQOzARt2udZSO/4QCcDf+j/XRbJn2PudsSoyjw - 3B2boakAnA9A9b8UoEYgmLTRpwXYuhsxOCDE - =8MsV - -----END PGP PUBLIC KEY BLOCK----- - -runcmd: -# HACK: cloud-init in Debian 10 does not take care of the following - - echo "PermitRootLogin yes" >> /etc/ssh/sshd_config - - systemctl restart sshd - - systemctl start qemu-guest-agent - # HACK: buster-backports repository has changed - - sed -i 's/deb.debian.org\/debian buster-backports/archive.debian.org\/debian buster-backports/g' /etc/apt/sources.list - -bootcmd: - # HACK: Make "gnupg" to be installed before configuring repos, so gpg key can be imported - - DEBIAN_FRONTEND=noninteractive apt-get -yq update - - DEBIAN_FRONTEND=noninteractive apt-get -yq install gnupg - -%{ if install_salt_bundle } -packages: ["venv-salt-minion", "avahi-daemon", "qemu-guest-agent", "apt-transport-https", "python-apt", "python3-apt"] -%{ else } -packages: ["salt-minion", "avahi-daemon", "qemu-guest-agent", "apt-transport-https", "python-apt", "python3-apt"] -%{ endif } -%{ endif } %{ if image == "amazonlinux2o" } diff --git a/backend_modules/null/base/variables.tf b/backend_modules/null/base/variables.tf index e2b5f55cb..7b5f8e270 100644 --- a/backend_modules/null/base/variables.tf +++ b/backend_modules/null/base/variables.tf @@ -67,7 +67,7 @@ variable "provider_settings" { variable "images" { description = "list of images to be uploaded to the libvirt host, leave default for all" - default = [ "almalinux8o", "almalinux9o", "amazonlinux2o", "centos7o", "libertylinux9o", "opensuse154o", "opensuse155o", "tumbleweedo", "oraclelinux9o", "rocky8o", "rocky9o", "sles12sp4o", "sles12sp5o", "sles15sp3o", "sles15sp4o", "ubuntu2004o", "ubuntu2204o"] + default = [ "almalinux8o", "almalinux9o", "amazonlinux2o", "centos7o", "libertylinux9o", "opensuse154o", "opensuse155o", "tumbleweedo", "oraclelinux9o", "rocky8o", "rocky9o", "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "ubuntu2004o", "ubuntu2204o"] type = set(string) } diff --git a/main.tf.libvirt-testsuite.example b/main.tf.libvirt-testsuite.example index ffddc6eff..7124b720f 100644 --- a/main.tf.libvirt-testsuite.example +++ b/main.tf.libvirt-testsuite.example @@ -37,7 +37,7 @@ module "cucumber_testsuite" { # "opensuse154o", "opensuse155o", # "oraclelinux9o", # "rocky8o", "rocky9o", - # "sles12sp4o", "sles12sp5o", "sles15o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", + # "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", # "ubuntu2004o", "ubuntu2204o" # to see what VM uses what image, have a look at the image variable in the cucumber_module definition # https://github.com/uyuni-project/sumaform/blob/master/modules/cucumber_testsuite/main.tf diff --git a/main.tf.libvirt-testsuite.example.Manager-43 b/main.tf.libvirt-testsuite.example.Manager-43 index 010645db4..f078209e3 100644 --- a/main.tf.libvirt-testsuite.example.Manager-43 +++ b/main.tf.libvirt-testsuite.example.Manager-43 @@ -37,7 +37,7 @@ module "cucumber_testsuite" { # "opensuse154o", "opensuse155o", # "oraclelinux9o", # "rocky8o", "rocky9o", - # "sles12sp4o", "sles12sp5o", "sles15o", "sles15sp1o", "sles15sp2o", "sles15sp3o", "sles15sp4o", + # "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", # "ubuntu2004o", "ubuntu2204o" # to see what VM uses what image, have a look at the image variable in the cucumber_module definition # https://github.com/uyuni-project/sumaform/blob/master/modules/cucumber_testsuite/main.tf diff --git a/modules/controller/main.tf b/modules/controller/main.tf index 197a24785..9a3da5279 100644 --- a/modules/controller/main.tf +++ b/modules/controller/main.tf @@ -70,21 +70,9 @@ module "controller" { sle15sp5_paygo_minion = length(var.sle15sp5_paygo_minion_configuration["hostnames"]) > 0 ? var.sle15sp5_paygo_minion_configuration["hostnames"][0] : null sle15sp6_paygo_minion = length(var.sle15sp6_paygo_minion_configuration["hostnames"]) > 0 ? var.sle15sp6_paygo_minion_configuration["hostnames"][0] : null sleforsap15sp5_paygo_minion = length(var.sleforsap15sp5_paygo_minion_configuration["hostnames"]) > 0 ? var.sleforsap15sp5_paygo_minion_configuration["hostnames"][0] : null - sle11sp4_minion = length(var.sle11sp4_minion_configuration["hostnames"]) > 0 ? var.sle11sp4_minion_configuration["hostnames"][0] : null - sle11sp4_sshminion = length(var.sle11sp4_sshminion_configuration["hostnames"]) > 0 ? var.sle11sp4_sshminion_configuration["hostnames"][0] : null - sle11sp4_client = length(var.sle11sp4_client_configuration["hostnames"]) > 0 ? var.sle11sp4_client_configuration["hostnames"][0] : null - sle12sp4_minion = length(var.sle12sp4_minion_configuration["hostnames"]) > 0 ? var.sle12sp4_minion_configuration["hostnames"][0] : null - sle12sp4_sshminion = length(var.sle12sp4_sshminion_configuration["hostnames"]) > 0 ? var.sle12sp4_sshminion_configuration["hostnames"][0] : null - sle12sp4_client = length(var.sle12sp4_client_configuration["hostnames"]) > 0 ? var.sle12sp4_client_configuration["hostnames"][0] : null sle12sp5_minion = length(var.sle12sp5_minion_configuration["hostnames"]) > 0 ? var.sle12sp5_minion_configuration["hostnames"][0] : null sle12sp5_sshminion = length(var.sle12sp5_sshminion_configuration["hostnames"]) > 0 ? var.sle12sp5_sshminion_configuration["hostnames"][0] : null sle12sp5_client = length(var.sle12sp5_client_configuration["hostnames"]) > 0 ? var.sle12sp5_client_configuration["hostnames"][0] : null - sle15_minion = length(var.sle15_minion_configuration["hostnames"]) > 0 ? var.sle15_minion_configuration["hostnames"][0] : null - sle15_sshminion = length(var.sle15_sshminion_configuration["hostnames"]) > 0 ? var.sle15_sshminion_configuration["hostnames"][0] : null - sle15_client = length(var.sle15_client_configuration["hostnames"]) > 0 ? var.sle15_client_configuration["hostnames"][0] : null - sle15sp1_minion = length(var.sle15sp1_minion_configuration["hostnames"]) > 0 ? var.sle15sp1_minion_configuration["hostnames"][0] : null - sle15sp1_sshminion = length(var.sle15sp1_sshminion_configuration["hostnames"]) > 0 ? var.sle15sp1_sshminion_configuration["hostnames"][0] : null - sle15sp1_client = length(var.sle15sp1_client_configuration["hostnames"]) > 0 ? var.sle15sp1_client_configuration["hostnames"][0] : null sle15sp2_minion = length(var.sle15sp2_minion_configuration["hostnames"]) > 0 ? var.sle15sp2_minion_configuration["hostnames"][0] : null sle15sp2_sshminion = length(var.sle15sp2_sshminion_configuration["hostnames"]) > 0 ? var.sle15sp2_sshminion_configuration["hostnames"][0] : null sle15sp2_client = length(var.sle15sp2_client_configuration["hostnames"]) > 0 ? var.sle15sp2_client_configuration["hostnames"][0] : null @@ -134,14 +122,10 @@ module "controller" { ubuntu2004_sshminion = length(var.ubuntu2004_sshminion_configuration["hostnames"]) > 0 ? var.ubuntu2004_sshminion_configuration["hostnames"][0] : null ubuntu2204_minion = length(var.ubuntu2204_minion_configuration["hostnames"]) > 0 ? var.ubuntu2204_minion_configuration["hostnames"][0] : null ubuntu2204_sshminion = length(var.ubuntu2204_sshminion_configuration["hostnames"]) > 0 ? var.ubuntu2204_sshminion_configuration["hostnames"][0] : null - debian10_minion = length(var.debian10_minion_configuration["hostnames"]) > 0 ? var.debian10_minion_configuration["hostnames"][0] : null - debian10_sshminion = length(var.debian10_sshminion_configuration["hostnames"]) > 0 ? var.debian10_sshminion_configuration["hostnames"][0] : null debian11_minion = length(var.debian11_minion_configuration["hostnames"]) > 0 ? var.debian11_minion_configuration["hostnames"][0] : null debian11_sshminion = length(var.debian11_sshminion_configuration["hostnames"]) > 0 ? var.debian11_sshminion_configuration["hostnames"][0] : null debian12_minion = length(var.debian12_minion_configuration["hostnames"]) > 0 ? var.debian12_minion_configuration["hostnames"][0] : null debian12_sshminion = length(var.debian12_sshminion_configuration["hostnames"]) > 0 ? var.debian12_sshminion_configuration["hostnames"][0] : null - sle11sp4_buildhost = length(var.sle11sp4_buildhost_configuration["hostnames"]) > 0 ? var.sle11sp4_buildhost_configuration["hostnames"][0] : null - sle11sp3_terminal_mac = var.sle11sp3_terminal_configuration["private_mac"] sle12sp5_buildhost = length(var.sle12sp5_buildhost_configuration["hostnames"]) > 0 ? var.sle12sp5_buildhost_configuration["hostnames"][0] : null sle12sp5_terminal_mac = var.sle12sp5_terminal_configuration["private_mac"] sle15sp3_buildhost = length(var.sle15sp3_buildhost_configuration["hostnames"]) > 0 ? var.sle15sp3_buildhost_configuration["hostnames"][0] : null diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index c31e01b57..c758d8c78 100644 --- a/modules/controller/variables.tf +++ b/modules/controller/variables.tf @@ -149,48 +149,6 @@ variable "sleforsap15sp5_paygo_minion_configuration" { } } -variable "sle11sp4_minion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle11sp4_sshminion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle11sp4_client_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle12sp4_minion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle12sp4_sshminion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle12sp4_client_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - variable "sle12sp5_minion_configuration" { description = "use module..configuration, see main.tf.libvirt-testsuite.example" default = { @@ -212,48 +170,6 @@ variable "sle12sp5_client_configuration" { } } -variable "sle15_minion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle15_sshminion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle15_client_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle15sp1_minion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle15sp1_sshminion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle15sp1_client_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - variable "sle15sp2_minion_configuration" { description = "use module..configuration, see main.tf.libvirt-testsuite.example" default = { @@ -590,20 +506,6 @@ variable "ubuntu2204_sshminion_configuration" { } } -variable "debian10_minion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "debian10_sshminion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - variable "debian11_minion_configuration" { description = "use module..configuration, see main.tf.libvirt-testsuite.example" default = { @@ -683,23 +585,6 @@ variable "sle12sp5_terminal_configuration" { } } -variable "sle11sp4_buildhost_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "sle11sp3_terminal_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - private_mac = null - private_ip = null - private_name = null - image = null - } -} - variable "opensuse154arm_minion_configuration" { description = "use module..configuration, see main.tf.libvirt-testsuite.example" default = { diff --git a/modules/cucumber_testsuite/variables.tf b/modules/cucumber_testsuite/variables.tf index ffbb4da83..8e8c7d974 100644 --- a/modules/cucumber_testsuite/variables.tf +++ b/modules/cucumber_testsuite/variables.tf @@ -38,7 +38,7 @@ variable "name_prefix" { variable "images" { description = "list of images to be uploaded to the libvirt host, leave default for all" - default = ["centos7o", "opensuse155o", "leapmicro55o", "slemicro55o", "rocky8o", "rocky9o", "sles12sp4o", "sles12sp5o", "sles15sp3o", "sles15sp4o", "ubuntu2004o", "ubuntu2204o", "suma43VM-ign"] + default = ["centos7o", "opensuse155o", "leapmicro55o", "slemicro55o", "rocky8o", "rocky9o", "sles12sp5o", "sles15sp2o", "sles15sp3o", "sles15sp4o", "sles15sp5o", "sles15sp6o", "ubuntu2004o", "ubuntu2204o", "suma43VM-ign"] } variable "main_disk_size" { diff --git a/modules/dhcp_dns/variables.tf b/modules/dhcp_dns/variables.tf index dcfbc6280..e07623673 100644 --- a/modules/dhcp_dns/variables.tf +++ b/modules/dhcp_dns/variables.tf @@ -22,7 +22,7 @@ variable "private_hosts" { } variable "image" { - description = "an image name, e.g. sles12sp5 or opensuse155o" + description = "an image name, e.g. sles12sp4 or opensuse155o" type = string default = "opensuse155o" } diff --git a/modules/jenkins/variables.tf b/modules/jenkins/variables.tf index 797955176..366437014 100644 --- a/modules/jenkins/variables.tf +++ b/modules/jenkins/variables.tf @@ -53,7 +53,7 @@ variable "volume_provider_settings" { } variable "image" { - description = "An image name, e.g. sles15sp2o or opensuse155o" + description = "An image name, e.g. sles12sp4 or opensuse155o" type = string - default = "opensuse155o" + default = "opensuse155o" } diff --git a/modules/virthost/variables.tf b/modules/virthost/variables.tf index 1a587cb89..73fc38933 100644 --- a/modules/virthost/variables.tf +++ b/modules/virthost/variables.tf @@ -87,7 +87,7 @@ variable "hvm_disk_image" { } variable "image" { - description = "One of: sles15, sles15sp1, sles15sp2, sles15sp2o, sles15sp3o, sles15sp4o or opensuse155o" + description = "One of: sles15sp2, sles15sp2o, sles15sp3o, sles15sp4o, sles15sp4o, sles15sp5o, sles15sp6o, or opensuse155o" type = string } diff --git a/salt/controller/bashrc b/salt/controller/bashrc index 8f0908f58..ae9ae86fc 100644 --- a/salt/controller/bashrc +++ b/salt/controller/bashrc @@ -26,21 +26,9 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host defined {% endif %} {% if grains.get('sle15sp5_paygo_minion') | default(false, true) %}export SLE15SP5_PAYGO_MINION="{{ grains.get('sle15sp5_paygo_minion') }}" {% else %}# no SLE15SP5_PAYGO minion defined {% endif %} {% if grains.get('sle15sp6_paygo_minion') | default(false, true) %}export SLE15SP6_PAYGO_MINION="{{ grains.get('sle15sp6_paygo_minion') }}" {% else %}# no SLE15SP6_PAYGO minion defined {% endif %} {% if grains.get('sleforsap15sp5_paygo_minion') | default(false, true) %}export SLEFORSAP15SP5_PAYGO_MINION="{{ grains.get('sleforsap15sp5_paygo_minion') }}" {% else %}# no SLEFORSAP15SP5_PAYGO minion defined {% endif %} -{% if grains.get('sle11sp4_minion') | default(false, true) %}export SLE11SP4_MINION="{{ grains.get('sle11sp4_minion') }}" {% else %}# no SLE11SP4 minion defined {% endif %} -{% if grains.get('sle11sp4_sshminion') | default(false, true) %}export SLE11SP4_SSHMINION="{{ grains.get('sle11sp4_sshminion') }}" {% else %}# no SLE11SP4 ssh minion defined {% endif %} -{% if grains.get('sle11sp4_client') | default(false, true) %}export SLE11SP4_CLIENT="{{ grains.get('sle11sp4_client') }}" {% else %}# no SLE11SP4 client defined {% endif %} -{% if grains.get('sle12sp4_minion') | default(false, true) %}export SLE12SP4_MINION="{{ grains.get('sle12sp4_minion') }}" {% else %}# no SLE12SP4 minion defined {% endif %} -{% if grains.get('sle12sp4_sshminion') | default(false, true) %}export SLE12SP4_SSHMINION="{{ grains.get('sle12sp4_sshminion') }}" {% else %}# no SLE12SP4 ssh minion defined {% endif %} -{% if grains.get('sle12sp4_client') | default(false, true) %}export SLE12SP4_CLIENT="{{ grains.get('sle12sp4_client') }}" {% else %}# no SLE12SP4 client defined {% endif %} {% if grains.get('sle12sp5_minion') | default(false, true) %}export SLE12SP5_MINION="{{ grains.get('sle12sp5_minion') }}" {% else %}# no SLE12SP5 minion defined {% endif %} {% if grains.get('sle12sp5_sshminion') | default(false, true) %}export SLE12SP5_SSHMINION="{{ grains.get('sle12sp5_sshminion') }}" {% else %}# no SLE12SP5 ssh minion defined {% endif %} {% if grains.get('sle12sp5_client') | default(false, true) %}export SLE12SP5_CLIENT="{{ grains.get('sle12sp5_client') }}" {% else %}# no SLE12SP5 client defined {% endif %} -{% if grains.get('sle15_minion') | default(false, true) %}export SLE15_MINION="{{ grains.get('sle15_minion') }}" {% else %}# no SLE15 minion defined {% endif %} -{% if grains.get('sle15_sshminion') | default(false, true) %}export SLE15_SSHMINION="{{ grains.get('sle15_sshminion') }}" {% else %}# no SLE15 ssh minion defined {% endif %} -{% if grains.get('sle15_client') | default(false, true) %}export SLE15_CLIENT="{{ grains.get('sle15_client') }}" {% else %}# no SLE15 client defined {% endif %} -{% if grains.get('sle15sp1_minion') | default(false, true) %}export SLE15SP1_MINION="{{ grains.get('sle15sp1_minion') }}" {% else %}# no SLE15SP1 minion defined {% endif %} -{% if grains.get('sle15sp1_sshminion') | default(false, true) %}export SLE15SP1_SSHMINION="{{ grains.get('sle15sp1_sshminion') }}" {% else %}# no SLE15SP1 ssh minion defined {% endif %} -{% if grains.get('sle15sp1_client') | default(false, true) %}export SLE15SP1_CLIENT="{{ grains.get('sle15sp1_client') }}" {% else %}# no SLE15SP1 client defined {% endif %} {% if grains.get('sle15sp2_minion') | default(false, true) %}export SLE15SP2_MINION="{{ grains.get('sle15sp2_minion') }}" {% else %}# no SLE15SP2 minion defined {% endif %} {% if grains.get('sle15sp2_sshminion') | default(false, true) %}export SLE15SP2_SSHMINION="{{ grains.get('sle15sp2_sshminion') }}" {% else %}# no SLE15SP2 ssh minion defined {% endif %} {% if grains.get('sle15sp2_client') | default(false, true) %}export SLE15SP2_CLIENT="{{ grains.get('sle15sp2_client') }}" {% else %}# no SLE15SP2 client defined {% endif %} @@ -90,8 +78,6 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host defined {% endif %} {% if grains.get('ubuntu2004_sshminion') | default(false, true) %}export UBUNTU2004_SSHMINION="{{ grains.get('ubuntu2004_sshminion') }}" {% else %}# no UBUNTU2004 ssh minion defined {% endif %} {% if grains.get('ubuntu2204_minion') | default(false, true) %}export UBUNTU2204_MINION="{{ grains.get('ubuntu2204_minion') }}" {% else %}# no UBUNTU2204 minion defined {% endif %} {% if grains.get('ubuntu2204_sshminion') | default(false, true) %}export UBUNTU2204_SSHMINION="{{ grains.get('ubuntu2204_sshminion') }}" {% else %}# no UBUNTU2204 ssh minion defined {% endif %} -{% if grains.get('debian10_minion') | default(false, true) %}export DEBIAN10_MINION="{{ grains.get('debian10_minion') }}" {% else %}# no DEBIAN10 minion defined {% endif %} -{% if grains.get('debian10_sshminion') | default(false, true) %}export DEBIAN10_SSHMINION="{{ grains.get('debian10_sshminion') }}" {% else %}# no DEBIAN10 ssh minion defined {% endif %} {% if grains.get('debian11_minion') | default(false, true) %}export DEBIAN11_MINION="{{ grains.get('debian11_minion') }}" {% else %}# no DEBIAN11 minion defined {% endif %} {% if grains.get('debian11_sshminion') | default(false, true) %}export DEBIAN11_SSHMINION="{{ grains.get('debian11_sshminion') }}" {% else %}# no DEBIAN11 ssh minion defined {% endif %} {% if grains.get('debian12_minion') | default(false, true) %}export DEBIAN12_MINION="{{ grains.get('debian12_minion') }}" {% else %}# no DEBIAN12 minion defined {% endif %} @@ -102,8 +88,6 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host defined {% endif %} {% if grains.get('sle15sp3_terminal_mac') | default(false, true) %}export SLE15SP3_TERMINAL_MAC="{{ grains.get('sle15sp3_terminal_mac') }}" {% else %}# no SLE15SP3 terminal MAC defined {% endif %} {% if grains.get('sle12sp5_buildhost') | default(false, true) %}export SLE12SP5_BUILDHOST="{{ grains.get('sle12sp5_buildhost') }}" {% else %}# no SLE12SP5 buildhost defined {% endif %} {% if grains.get('sle12sp5_terminal_mac') | default(false, true) %}export SLE12SP5_TERMINAL_MAC="{{ grains.get('sle12sp5_terminal_mac') }}" {% else %}# no SLE12SP5 terminal MAC defined {% endif %} -{% if grains.get('sle11sp4_buildhost') | default(false, true) %}export SLE11SP4_BUILDHOST="{{ grains.get('sle11sp4_buildhost') }}" {% else %}# no SLE11SP4 buildhost defined {% endif %} -{% if grains.get('sle11sp3_terminal_mac') | default(false, true) %}export SLE11SP3_TERMINAL_MAC="{{ grains.get('sle11sp3_terminal_mac') }}" {% else %}# no SLE11SP3 terminal MAC defined {% endif %} {% if grains.get('opensuse154arm_minion') | default(false, true) %}export OPENSUSE154ARM_MINION="{{ grains.get('opensuse154arm_minion') }}" {% else %}# no OPENSUSE154ARM minion defined {% endif %} {% if grains.get('opensuse154arm_sshminion') | default(false, true) %}export OPENSUSE154ARM_SSHMINION="{{ grains.get('opensuse154arm_sshminion') }}" {% else %}# no OPENSUSE154ARM ssh minion defined {% endif %} {% if grains.get('opensuse155arm_minion') | default(false, true) %}export OPENSUSE155ARM_MINION="{{ grains.get('opensuse155arm_minion') }}" {% else %}# no OPENSUSE155ARM minion defined {% endif %} diff --git a/salt/default/avahi.sls b/salt/default/avahi.sls index 68621e017..318f0e850 100644 --- a/salt/default/avahi.sls +++ b/salt/default/avahi.sls @@ -8,18 +8,8 @@ include: custom_avahi_repo: pkgrepo.managed: - humanname: custom_avahi_repo - {% if grains['osrelease'] == '11.4' %} - - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.6.23/SLE_11_SP4/ - {% elif grains['osrelease'] == '12.3' %} - - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.6.32/SLE_12_SP3/ - {% elif grains['osrelease'] == '12.4' %} - - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.6.32/SLE_12_SP4/ - {% elif grains['osrelease'] == '12.5' %} + {% if grains['osrelease'] == '12.5' %} - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.6.32/SLE_12_SP5/ - {% elif grains['osrelease'] == '15' %} - - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.7/SLE_15/ - {% elif grains['osrelease'] == '15.1' %} - - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.7/SLE_15_SP1/ {% elif grains['osrelease'] == '15.2' %} - baseurl: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools:/avahi:/0.7/SLE_15_SP2/ {% elif grains['osrelease'] == '15.3' %} diff --git a/salt/default/grub.sls b/salt/default/grub.sls deleted file mode 100644 index 5bb10dcbe..000000000 --- a/salt/default/grub.sls +++ /dev/null @@ -1,20 +0,0 @@ -# HACK -# Use symlinks to boot SLES 11 SP4 -# That's needed when we patch the kernel on such a system -{% if grains['osfullname'] == 'SLES' %} - -{% if grains['osrelease'] == '11.4' %} -grub_hack: - file.replace: - - name: /boot/grub/menu.lst - - pattern: ^(title.*)$ - - count: 1 - - repl: | - title sles11sp4_fixed - root (hd0,0) - kernel /boot/vmlinuz vga=0x314 splash=silent console=tty0 console=ttyS0,115200 root=/dev/vda1 disk=/dev/vda nomodeset elevator=noop showopts - initrd /boot/initrd - \1 -{% endif %} - -{% endif %} diff --git a/salt/default/init.sls b/salt/default/init.sls index 3cbcc5679..b6ed1f8b2 100644 --- a/salt/default/init.sls +++ b/salt/default/init.sls @@ -3,7 +3,6 @@ include: - default.update - default.minimal - default.pkgs - - default.grub - default.sshd {% if grains.get('reset_ids') | default(false, true) %} - default.ids diff --git a/salt/default/time.sls b/salt/default/time.sls index 798a1d65f..27e0f3c68 100644 --- a/salt/default/time.sls +++ b/salt/default/time.sls @@ -29,25 +29,7 @@ timezone_setting: {% if grains['use_ntp'] %} -{% if ((grains['osfullname'] == 'SLES') and (grains['osrelease'] == '11.4')) - or ((grains['os_family'] == 'Debian') and (grains['osrelease'] == '10')) -%} - -ntp_pkg: - pkg.installed: - - name: ntp - -ntp_conf_file: - file.managed: - - name: /etc/ntp.conf - - source: salt://default/ntp.conf - -ntp_enable_service: - service.running: - - name: ntp - - enable: true - -{% elif grains['osfullname'] == 'Leap' %} +{% if grains['osfullname'] == 'Leap' %} ntp_pkg: pkg.installed: diff --git a/salt/mirror/etc/minima.yaml b/salt/mirror/etc/minima.yaml index 00362aa02..0075dceb4 100644 --- a/salt/mirror/etc/minima.yaml +++ b/salt/mirror/etc/minima.yaml @@ -6,69 +6,15 @@ scc: username: {{ grains.get("cc_username") }} password: {{ grains.get("cc_password") }} repo_names: - # required by testsuite - - SLES11-SP1-Pool - - SLES11-SP1-Updates - - SLES11-SP1-SUSE-Manager-Tools - - SLE11-SDK-SP1-Pool - - SLE11-SDK-SP1-Updates - - SUSE-Manager-Proxy-2.1-Pool - - SUSE-Manager-Proxy-2.1-Updates - - SLES11-SP3-Pool - - SLES11-SP3-Updates - # Required for SLED testing - SLE-15-GA-Desktop-NVIDIA-Driver - - SLE-15-SP1-Desktop-NVIDIA-Driver - SLE-15-SP2-Desktop-NVIDIA-Driver - # SLES - - SLES11-SP4-Pool - - SLES11-SP4-Updates - - SLES12-SP3-Pool - - SLES12-SP3-Updates - - SLES12-SP3-LTSS-Updates - - SLES12-SP4-Pool - - SLES12-SP4-Updates - - SLES12-SP4-LTSS-Updates + # SLE 12-SP5 - SLES12-SP5-Pool - SLES12-SP5-Updates - # uncomment when it goes LTSS + # uncomment when it goes LTSS (October 2024) # - SLES12-SP5-LTSS-Updates - # SLE 15 Products - - SLE-Product-SLES15-Pool - - SLE-Product-SLES15-Updates - - SLE-Product-SLES15-LTSS-Updates - - SLE-Product-SLES_SAP15-Pool - - SLE-Product-SLES_SAP15-Updates - - SLE-Product-SLED15-Pool - - SLE-Product-SLED15-Updates - # SLE 15 Basic Modules - - SLE-Module-Basesystem15-Pool - - SLE-Module-Basesystem15-Updates - - SLE-Module-Server-Applications15-Pool - - SLE-Module-Server-Applications15-Updates - - SLE-Module-Desktop-Applications15-Pool - - SLE-Module-Desktop-Applications15-Updates - - SLE-Product-WE15-Pool - - SLE-Product-WE15-Updates - # SLE 15-SP1 Products - - SLE-Product-SLES15-SP1-Pool - - SLE-Product-SLES15-SP1-Updates - - SLE-Product-SLES15-SP1-LTSS-Updates - # SLE 15-SP1 Basic Modules - - SLE-Module-Basesystem15-SP1-Pool - - SLE-Module-Basesystem15-SP1-Updates - - SLE-Module-Server-Applications15-SP1-Pool - - SLE-Module-Server-Applications15-SP1-Updates - - SLE-Module-Web-Scripting15-SP1-Pool - - SLE-Module-Web-Scripting15-SP1-Updates - - SLE-Module-Desktop-Applications15-SP1-Pool - - SLE-Module-Desktop-Applications15-SP1-Updates - - SLE-Module-DevTools15-SP1-Pool - - SLE-Module-DevTools15-SP1-Updates - - SLE-Module-Python2-15-SP1-Pool - - SLE-Module-Python2-15-SP1-Update # SLE 15-SP2 Products - SLE-Product-SLES15-SP2-Pool - SLE-Product-SLES15-SP2-Updates @@ -168,8 +114,6 @@ scc: - SLE-Module-Containers12-Updates - SLE-Module-Containers15-Pool - SLE-Module-Containers15-Updates - - SLE-Module-Containers15-SP1-Pool - - SLE-Module-Containers15-SP1-Updates - SLE-Module-Containers15-SP2-Pool - SLE-Module-Containers15-SP2-Updates - SLE-Module-Containers15-SP3-Pool @@ -204,7 +148,6 @@ scc: - SLE-Module-SUSE-Manager-Retail-Branch-Server-4.3-Pool - SLE-Module-SUSE-Manager-Retail-Branch-Server-4.3-Updates # SUSE Manager Tools - - SLES11-SP4-SUSE-Manager-Tools - SLE-Manager-Tools12-Pool - SLE-Manager-Tools12-Updates - SLE-Manager-Tools15-Pool @@ -215,7 +158,6 @@ scc: - Ubuntu-20.04-SUSE-Manager-Tools - Ubuntu-22.04-SUSE-Manager-Tools # SUSE Manager Beta Tools - - SLES11-SP4-SUSE-Manager-Tools-Beta - SLE-Manager-Tools12-Pool-Beta - SLE-Manager-Tools12-Updates-Beta - SLE-Manager-Tools15-Pool-Beta @@ -233,47 +175,11 @@ http: # # archs: [x86_64] # Required for SLED testing - - url: https://download.nvidia.com/suse/sle15 - - url: https://download.nvidia.com/suse/sle15sp1 - url: https://download.nvidia.com/suse/sle15sp2 - url: https://download.nvidia.com/suse/sle15sp3 - url: https://download.nvidia.com/suse/sle15sp4 - - # SLES 11 SP4 Test - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/11-SP4:/x86_64/update - archs: [x86_64] - - # SLES 12 SP3 Test - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-SP3:/x86_64/update - archs: [x86_64] - - # SLES 12 SP4 Test - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-SERVER:/12-SP4:/x86_64/update - archs: [x86_64] - - # SLES 15 Test - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Basesystem:/15:/x86_64/update - archs: [x86_64] - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Server-Applications:/15:/x86_64/update - archs: [x86_64] - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Web-Scripting:/15:/x86_64/update - archs: [x86_64] - - # SLES 15 SP1 Test - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Basesystem:/15-SP1:/x86_64/update - archs: [x86_64] - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Containers:/15-SP1:/x86_64/update - archs: [x86_64] - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Desktop-Applications:/15-SP1:/x86_64/update - archs: [x86_64] - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Development-Tools:/15-SP1:/x86_64/update - archs: [x86_64] - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Python2:/15-SP1:/x86_64/update - archs: [x86_64] - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Server-Applications:/15-SP1:/x86_64/update - archs: [x86_64] - - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Web-Scripting:/15-SP1:/x86_64/update - archs: [x86_64] + - url: https://download.nvidia.com/suse/sle15sp5 + - url: https://download.nvidia.com/suse/sle15sp6 # SLES 15 SP2 Test - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Basesystem:/15-SP2:/x86_64/update @@ -343,10 +249,6 @@ http: - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2/images/repo/SLE-Module-SUSE-Manager-Testing-Overlay-4.2-POOL-x86_64-Media1/ archs: [x86_64] - # SLE 11 SP4 Manager Tools 4.2 devel - - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/SLE11-SUSE-Manager-Tools/images/repo/SLE-11-SP4-CLIENT-TOOLS-ia64-ppc64-s390x-x86_64-Media1/suse - archs: [x86_64] - # SLE 12 (GA and all SPs) Manager Tools 4.2 devel - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/SLE12-SUSE-Manager-Tools/images/repo/SLE-12-Manager-Tools-POOL-x86_64-Media1 archs: [x86_64] @@ -367,10 +269,6 @@ http: - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/Ubuntu20.04-SUSE-Manager-Tools/xUbuntu_20.04 archs: [amd64] - # Debian 10 Manager Tools 4.2 devel - - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.2:/Debian10-SUSE-Manager-Tools/Debian_10 - archs: [amd64] - # SUSE Manager 4.3 devel - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.3/SLE_15_SP4 archs: [x86_64] @@ -407,10 +305,6 @@ http: - url: https://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.3:/Ubuntu22.04-SUSE-Manager-Tools/xUbuntu_22.04/ archs: [amd64] - # Debian 10 Manager Tools 4.3 devel - - url: https://download.suse.de/download/ibs/Devel:/Galaxy:/Manager:/4.3:/Debian10-SUSE-Manager-Tools/Debian_10/ - archs: [amd64] - # Debian 11 Manager Tools 4.3 devel - url: https://download.suse.de/download/ibs/Devel:/Galaxy:/Manager:/4.3:/Debian11-SUSE-Manager-Tools/Debian_11/ archs: [amd64] @@ -449,10 +343,6 @@ http: - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head:/Ubuntu22.04-SUSE-Manager-Tools/xUbuntu_22.04 archs: [amd64] - # Debian 10 Manager Tools Head devel - - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head:/Debian10-SUSE-Manager-Tools/Debian_10 - archs: [amd64] - # openSUSE Leap - url: http://download.opensuse.org/distribution/leap/15.2/repo/oss archs: [x86_64] @@ -480,23 +370,15 @@ http: - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb # Software for sumaformed Virtual Machines - - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_11_SP4 - archs: [x86_64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_12_SP3 - archs: [x86_64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_12_SP4 - archs: [x86_64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_15_SP1 - archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_15_SP2 archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_15_SP3 archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_15_SP4 archs: [x86_64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.0 + - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_15_SP5 archs: [x86_64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.1 + - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_15_SP6 archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.2 archs: [x86_64] @@ -504,14 +386,14 @@ http: archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.4 archs: [x86_64] - # Jenkins - - url: http://download.opensuse.org/repositories/devel:/tools:/building/SLE_15_SP1 + - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.5 archs: [x86_64] - - url: http://download.opensuse.org/repositories/devel:/tools:/building/SLE_15_SP2 + - url: http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/openSUSE_Leap_15.6 archs: [x86_64] - - url: http://download.opensuse.org/repositories/devel:/tools:/building/15.3 + # Jenkins + - url: http://download.opensuse.org/repositories/devel:/tools:/building/15.5 archs: [x86_64] - - url: http://download.opensuse.org/repositories/devel:/tools:/building/15.4 + - url: http://download.opensuse.org/repositories/devel:/tools:/building/15.6 archs: [x86_64] # Uyuni Master @@ -543,10 +425,10 @@ http: archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/Ubuntu2204-Uyuni-Client-Tools/xUbuntu_22.04/ archs: [x86_64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/Debian10-Uyuni-Client-Tools/Debian_10/ - archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/Debian11-Uyuni-Client-Tools/Debian_11/ archs: [x86_64] + - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/Debian12-Uyuni-Client-Tools/Debian_12/ + archs: [x86_64] # Uyuni Stable - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable/openSUSE_Leap_15.4/ @@ -573,7 +455,7 @@ http: archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2204-Uyuni-Client-Tools/xUbuntu_22.04/ archs: [x86_64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Debian10-Uyuni-Client-Tools/Debian_10/ - archs: [x86_64] - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Debian11-Uyuni-Client-Tools/Debian_11/ archs: [x86_64] + - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Debian12-Uyuni-Client-Tools/Debian_12/ + archs: [x86_64] diff --git a/salt/mirror/etc/mirror-images.conf b/salt/mirror/etc/mirror-images.conf index 84f6d8148..fe6da6686 100644 --- a/salt/mirror/etc/mirror-images.conf +++ b/salt/mirror/etc/mirror-images.conf @@ -1,14 +1,10 @@ https://github.com/uyuni-project/sumaform-images/releases/download/4.3.0/centos7.qcow2 -http://download.suse.de/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles15.x86_64.qcow2 -http://download.suse.de/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles15sp1.x86_64.qcow2 http://download.suse.de/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles15sp2.x86_64.qcow2 http://download.suse.de/ibs/Devel:/Galaxy:/Terraform:/Images/images/sles12sp4.x86_64.qcow2 http://cloud.centos.org/centos/6/images/CentOS-6-x86_64-GenericCloud.qcow2 http://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud.qcow2 http://cloud.centos.org/centos/8/x86_64/images/CentOS-8-GenericCloud-8.1.1911-20200113.3.x86_64.qcow2 http://download.opensuse.org/distribution/leap/15.2/appliances/openSUSE-Leap-15.2-JeOS.x86_64-OpenStack-Cloud.qcow2 -http://download.suse.de/install/SLE-15-JeOS-GM/SLES15-JeOS.x86_64-15.0-OpenStack-Cloud-GM.qcow2 -http://download.suse.de/install/SLE-15-SP1-JeOS-QU2/SLES15-SP1-JeOS.x86_64-15.1-OpenStack-Cloud-QU2.qcow2 http://download.suse.de/install/SLE-15-SP2-JeOS-GM/SLES15-SP2-JeOS.x86_64-15.2-OpenStack-Cloud-GM.qcow2 https://schnell.suse.de/SLE12/SLE-12-SP4-JeOS-GM/SLES12-SP4-JeOS.x86_64-12.4-OpenStack-Cloud-GM.qcow2 http://download.suse.de/install/SLE-12-SP5-JeOS-GM/SLES12-SP5-JeOS.x86_64-12.5-OpenStack-Cloud-GM.qcow2 diff --git a/salt/repos/build_host.sls b/salt/repos/build_host.sls index 2c6c6e280..2941770da 100644 --- a/salt/repos/build_host.sls +++ b/salt/repos/build_host.sls @@ -15,11 +15,7 @@ containers_updates_repo: {% if '15' in grains['osrelease'] %} -{% if grains['osrelease'] == '15' %} -{% set sle_version_path = '15' %} -{% elif grains['osrelease'] == '15.1' %} -{% set sle_version_path = '15-SP1' %} -{% elif grains['osrelease'] == '15.2' %} +{% if grains['osrelease'] == '15.2' %} {% set sle_version_path = '15-SP2' %} {% elif grains['osrelease'] == '15.3' %} {% set sle_version_path = '15-SP3' %} diff --git a/salt/repos/clienttools.sls b/salt/repos/clienttools.sls index 23601386c..e9b7f3e77 100644 --- a/salt/repos/clienttools.sls +++ b/salt/repos/clienttools.sls @@ -50,37 +50,6 @@ beta_tools_update_repo: {% elif grains['osfullname'] == 'SLES' %} -{% if grains['osrelease'] == '11.4' %} - -tools_pool_repo: - pkgrepo.managed: - {% if grains.get('mirror') %} - {% if 'beta' in grains.get('product_version') | default('', true) %} - - baseurl: http://{{ grains.get("mirror") }}/repo/$RCE/SLES11-SP4-SUSE-Manager-Tools-Beta/sle-11-x86_64/ - {% else %} - - baseurl: http://{{ grains.get("mirror") }}/repo/$RCE/SLES11-SP4-SUSE-Manager-Tools/sle-11-x86_64/ - {% endif %} - {% else %} - {% if 'beta' in grains.get('product_version') | default('', true) %} - - baseurl: http://euklid.nue.suse.com/mirror/SuSE/build-ncc.suse.de/SUSE/Updates/SLE-SERVER/11-SP4-CLIENT-TOOLS-BETA/x86_64/update/ - {% else %} - - baseurl: http://euklid.nue.suse.com/mirror/SuSE/build-ncc.suse.de/SUSE/Updates/SLE-SERVER/11-SP4-CLIENT-TOOLS/x86_64/update/ - {% endif %} - {% endif %} - - refresh: True - -# SLE11 will not get Head/4.3 client tools. Submissions to be done from 4.2 until it's EoL from a SUSE Manager POV, and removed completely from sumaform -{% if 'nightly' in grains.get('product_version') | default('', true) %} -tools_additional_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/Devel:/Galaxy:/Manager:/4.2:/SLE11-SUSE-Manager-Tools/images/repo/SLE-11-SP4-CLIENT-TOOLS-ia64-ppc64-s390x-x86_64-Media1/suse/ - - refresh: True - - priority: 98 -{% endif %} - -{% endif %} {# grains['osrelease'] == '11.4' #} - - {% if '12' in grains['osrelease'] %} {% if not grains.get('product_version') or not grains.get('product_version').startswith('uyuni-') %} {# Released Tools Repos #} diff --git a/salt/repos/minion.sls b/salt/repos/minion.sls index b2bbf45d4..05334778b 100644 --- a/salt/repos/minion.sls +++ b/salt/repos/minion.sls @@ -2,11 +2,7 @@ {% if '15' in grains['osrelease'] %} -{% if grains['osrelease'] == '15' %} -{% set sle_version_path = '15' %} -{% elif grains['osrelease'] == '15.1' %} -{% set sle_version_path = '15-SP1' %} -{% elif grains['osrelease'] == '15.2' %} +{% if grains['osrelease'] == '15.2' %} {% set sle_version_path = '15-SP2' %} {% elif grains['osrelease'] == '15.3' %} {% set sle_version_path = '15-SP3' %} diff --git a/salt/repos/os.sls b/salt/repos/os.sls index 59ba10666..750868b1d 100644 --- a/salt/repos/os.sls +++ b/salt/repos/os.sls @@ -27,68 +27,9 @@ backports_update_repo: {% elif grains['osfullname'] == 'SLES' %} -{% if grains['osrelease'] == '11.4' %} -os_pool_repo: - pkgrepo.managed: - {% if grains.get('mirror') %} - - baseurl: http://{{ grains.get("mirror") }}/repo/$RCE/SLES11-SP4-Pool/sle-11-x86_64/ - {% else %} - - baseurl: http://euklid.nue.suse.com/mirror/SuSE/zypp-patches.suse.de/x86_64/update/SLE-SERVER/11-SP4-POOL/ - {% endif %} - - refresh: True - -os_update_repo: - pkgrepo.managed: - {% if grains.get('mirror') %} - - baseurl: http://{{ grains.get("mirror") }}/repo/$RCE/SLES11-SP4-Updates/sle-11-x86_64/ - {% else %} - - baseurl: http://euklid.nue.suse.com/mirror/SuSE/build-ncc.suse.de/SUSE/Updates/SLE-SERVER/11-SP4/x86_64/update/ - {% endif %} - - refresh: True - -os_ltss_repo: - pkgrepo.managed: - {% if grains.get('mirror') %} - - baseurl: http://{{ grains.get("mirror") }}/repo/$RCE/SLES11-SP4-LTSS-Updates/sle-11-x86_64/ - {% else %} - - baseurl: http://euklid.nue.suse.com/mirror/SuSE/build-ncc.suse.de/SUSE/Updates/SLE-SERVER/11-SP4-LTSS/x86_64/update/ - {% endif %} - - refresh: True -{% endif %} {# grains['osrelease'] == '11.4' #} - - {% if '12' in grains['osrelease'] %} {% if not grains.get('sles_registration_code') %} ## Skip if SCC support -{% if grains['osrelease'] == '12.3' %} - -os_pool_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Products/SLE-SERVER/12-SP3/x86_64/product/ - - refresh: True - -os_update_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Updates/SLE-SERVER/12-SP3/x86_64/update/ - - refresh: True - -{% elif grains['osrelease'] == '12.4' %} - -os_pool_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Products/SLE-SERVER/12-SP4/x86_64/product/ - - refresh: True - -os_update_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Updates/SLE-SERVER/12-SP4/x86_64/update/ - - refresh: True - -os_ltss_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Updates/SLE-SERVER/12-SP4-LTSS/x86_64/update/ - - refresh: True - -{% elif grains['osrelease'] == '12.5' %} +{% if grains['osrelease'] == '12.5' %} os_pool_repo: pkgrepo.managed: @@ -113,41 +54,7 @@ os_update_repo: {% if '15' in grains['osrelease'] %} {% if not ( grains.get('server_registration_code') or grains.get('proxy_registration_code') or grains.get('sles_registration_code') or 'paygo' in grains.get('product_version') | default('', true)) %} ## Skip if SCC support or PAYG -{% if '15' == grains['osrelease'] %} - -os_pool_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Products/SLE-Module-Basesystem/15/x86_64/product/ - - refresh: True - -os_update_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Updates/SLE-Module-Basesystem/15/x86_64/update/ - - refresh: True - -os_ltss_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Updates/SLE-Product-SLES/15-LTSS/x86_64/update/ - - refresh: True - -{% elif '15.1' == grains['osrelease'] %} - -os_pool_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Products/SLE-Module-Basesystem/15-SP1/x86_64/product/ - - refresh: True - -os_update_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Updates/SLE-Module-Basesystem/15-SP1/x86_64/update/ - - refresh: True - -os_ltss_repo: - pkgrepo.managed: - - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Updates/SLE-Product-SLES/15-SP1-LTSS/x86_64/update/ - - refresh: True - -{% elif '15.2' == grains['osrelease'] %} +{% if '15.2' == grains['osrelease'] %} os_pool_repo: pkgrepo.managed: diff --git a/salt/repos/tools.sls b/salt/repos/tools.sls index 67ef7cc0c..21b46fceb 100644 --- a/salt/repos/tools.sls +++ b/salt/repos/tools.sls @@ -11,14 +11,8 @@ {% endif %} {% if grains['osfullname'] != 'Leap' %} -{% if grains['osrelease'] == '11.4' %} -{% set path = 'SLE_11_SP4' %} -{% elif grains['osrelease'] == '12.3' %} -{% set path = 'SLE_12_SP3' %} -{% elif grains['osrelease'] == '12.4' %} -{% set path = 'SLE_12_SP4' %} -{% elif grains['osrelease'] == '15.1' %} -{% set path = 'SLE_15_SP1' %} +{% if grains['osrelease'] == '12.5' %} +{% set path = 'SLE_12_SP5' %} {% elif grains['osrelease'] == '15.2' %} {% set path = 'SLE_15_SP2' %} {% elif grains['osrelease'] == '15.3' %} @@ -27,6 +21,8 @@ {% set path = 'SLE_15_SP4' %} {% elif grains['osrelease'] == '15.5' %} {% set path = 'SLE_15_SP5' %} +{% elif grains['osrelease'] == '15.6' %} +{% set path = 'SLE_15_SP6' %} {% endif %} {% endif %} diff --git a/salt/repos/virthost.sls b/salt/repos/virthost.sls index 238a3f724..bdd4bc342 100644 --- a/salt/repos/virthost.sls +++ b/salt/repos/virthost.sls @@ -2,11 +2,7 @@ {% if grains['osfullname'] == 'SLES' %} -{% if grains['osrelease'] == '15' %} -{% set sle_version_path = '15' %} -{% elif grains['osrelease'] == '15.1' %} -{% set sle_version_path = '15-SP1' %} -{% elif grains['osrelease'] == '15.2' %} +{% if grains['osrelease'] == '15.2' %} {% set sle_version_path = '15-SP2' %} {% elif grains['osrelease'] == '15.3' %} {% set sle_version_path = '15-SP3' %} diff --git a/salt/salt_testenv/salt_bundle_package.sls b/salt/salt_testenv/salt_bundle_package.sls index c470f49a2..2db3c099e 100644 --- a/salt/salt_testenv/salt_bundle_package.sls +++ b/salt/salt_testenv/salt_bundle_package.sls @@ -1,9 +1,5 @@ {% if grains['os'] == 'Debian' %} - {% if grains['osrelease'] == '9' %} - {% set repo_path = 'Debian_9.0' %} - {% elif grains['osrelease'] == '10' %} - {% set repo_path = 'Debian_10' %} - {% elif grains['osrelease'] == '11' %} + {% if grains['osrelease'] == '11' %} {% set repo_path = 'Debian_11' %} {% elif grains['osrelease'] == '12' %} {% set repo_path = 'Debian_12' %} diff --git a/salt/virthost/init.sls b/salt/virthost/init.sls index 5eb86f7a5..b92cf8ac6 100644 --- a/salt/virthost/init.sls +++ b/salt/virthost/init.sls @@ -29,16 +29,6 @@ virthost_packages: - sls: repos - pkg: no_kernel_default_base -{% if grains['osrelease'] == '12.4' %} -# WORKAROUND for guestfs appliance missing libaugeas0 on 12SP4 -guestfs-fix: - file.append: - - name: /usr/lib64/guestfs/supermin.d/packages - - text: libaugeas0 - - require: - - pkg: virthost_packages -{% endif %} - # WORKAROUND for bsc#1181264 {% if grains['osrelease'] == '15.3' %} no-50-xen-hvm-x86_64.json: