diff --git a/backend_modules/aws/base/ami.tf b/backend_modules/aws/base/ami.tf index 997c1bebb..2db86a42c 100644 --- a/backend_modules/aws/base/ami.tf +++ b/backend_modules/aws/base/ami.tf @@ -411,27 +411,6 @@ data "aws_ami" "rocky9" { } } -data "aws_ami" "debian11" { - most_recent = true - name_regex = "^debian-11-amd64" - owners = ["136693071363"] - - filter { - name = "architecture" - values = ["x86_64"] - } - - filter { - name = "virtualization-type" - values = ["hvm"] - } - - filter { - name = "root-device-type" - values = ["ebs"] - } -} - data "aws_ami" "ubuntu2204" { most_recent = true name_regex = "^ubuntu/images/hvm-ssd/ubuntu-jammy-22.04" diff --git a/backend_modules/aws/base/main.tf b/backend_modules/aws/base/main.tf index d3c9e0782..3fc4d09f6 100644 --- a/backend_modules/aws/base/main.tf +++ b/backend_modules/aws/base/main.tf @@ -87,7 +87,6 @@ locals { sles12sp5 = { ami = data.aws_ami.sles12sp5.image_id }, sles12sp5-paygo = { ami = data.aws_ami.sles12sp5-paygo.image_id }, rocky8 = { ami = data.aws_ami.rocky8.image_id, ssh_user = "rocky" }, - debian11 = { ami = data.aws_ami.debian11.image_id, ssh_user= "admin" }, ubuntu2204 = { ami = data.aws_ami.ubuntu2204.image_id, ssh_user = "ubuntu" }, ubuntu2004 = { ami = data.aws_ami.ubuntu2004.image_id, ssh_user = "ubuntu" }, rhel8 = { ami = data.aws_ami.rhel8.image_id}, diff --git a/backend_modules/aws/host/user_data.yaml b/backend_modules/aws/host/user_data.yaml index 403d1205d..20356e1b3 100644 --- a/backend_modules/aws/host/user_data.yaml +++ b/backend_modules/aws/host/user_data.yaml @@ -255,42 +255,3 @@ runcmd: packages: ["venv-salt-minion"] %{ endif } -%{ if image == "debian11" } - -apt: - sources: - tools_pool_repo: - source: "deb http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/Debian11-Uyuni-Client-Tools/Debian_11/ /" - 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+BBMBCAAoBQJnTV1tAhsDBQkQRFMYBgsJCAcD - AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCXLl1sDSCDPqobCACZmP4jvLKA8hixwLbB - ws6UpppjKuZ1C29VlfydWW7Zh7YTlQEDweuaP++UTNpG4LFHYEG/h+0m2IiIK8pH - 37fzKn+xZB+9SA/4hE3RsJhzwCYXxRnnSzahmagskTQp+vPQS571n8rmXbLQVIV8 - VHOjY6CezItu5OAe4m0DVdS9u4LmikPwxV+irdJ1rMphBKzxccGFOmYFXKWWoEk7 - VAD02fKgzLdoE6QX9ocIChmDM/fNwEK3us7RWEd2jxqUYdseTsa22clbuR3Dg6SB - E/oQa9zikECUNi4T19DnBpquBzBHlmfnGBtHPkq1KF7mNhdLhD28Atn0gpOGZOnd - VzV9iEYEExECAAYFAlsnulUACgkQOzARt2udZSO/4QCcDf+j/XRbJn2PudsSoyjw - 3B2boakAnA9A9b8UoEYgmLTRpwXYuhsxOCDE - =eJaK - -----END PGP PUBLIC KEY BLOCK----- - -runcmd: - # WORKAROUND: cloud-init in Ubuntu does not take care of the following - - echo "PermitRootLogin yes" >> /etc/ssh/sshd_config - - echo "PubkeyAcceptedKeyTypes=+ssh-rsa" >> /etc/ssh/sshd_config - - systemctl restart sshd - # WORKAROUND: security release/updates does not have a Release file - - sed -i "s|bullseye/updates|bullseye-security|" /etc/apt/sources.list - -packages: ["venv-salt-minion"] -%{ endif } diff --git a/backend_modules/libvirt/base/main.tf b/backend_modules/libvirt/base/main.tf index ff7429333..2856543f5 100644 --- a/backend_modules/libvirt/base/main.tf +++ b/backend_modules/libvirt/base/main.tf @@ -28,7 +28,6 @@ locals { 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" ubuntu2404o = "${var.use_mirror_images ? "http://${var.mirror}" : "http://cloud-images.ubuntu.com"}/noble/current/noble-server-cloudimg-amd64.img" - 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" opensuse155-ci-pro = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/libvirt/images/opensuse155-ci-pr.x86_64.qcow2" slemicro51-ign = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_51/SUSE-MicroOS.x86_64-sumaform.qcow2" diff --git a/backend_modules/libvirt/host/user_data.yaml b/backend_modules/libvirt/host/user_data.yaml index c8757fea7..cc2d56e7a 100644 --- a/backend_modules/libvirt/host/user_data.yaml +++ b/backend_modules/libvirt/host/user_data.yaml @@ -612,55 +612,6 @@ runcmd: - systemctl start qemu-guest-agent %{ endif } -%{ if image == "debian11o" } -apt: - sources: - tools_pool_repo: - source: deb http://${ use_mirror_images ? mirror : "download.opensuse.org"}/repositories/systemsmanagement:/Uyuni:/Stable:/Debian11-Uyuni-Client-Tools/Debian_11/ / - 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+BBMBCAAoBQJnTV1tAhsDBQkQRFMYBgsJCAcD - AgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCXLl1sDSCDPqobCACZmP4jvLKA8hixwLbB - ws6UpppjKuZ1C29VlfydWW7Zh7YTlQEDweuaP++UTNpG4LFHYEG/h+0m2IiIK8pH - 37fzKn+xZB+9SA/4hE3RsJhzwCYXxRnnSzahmagskTQp+vPQS571n8rmXbLQVIV8 - VHOjY6CezItu5OAe4m0DVdS9u4LmikPwxV+irdJ1rMphBKzxccGFOmYFXKWWoEk7 - VAD02fKgzLdoE6QX9ocIChmDM/fNwEK3us7RWEd2jxqUYdseTsa22clbuR3Dg6SB - E/oQa9zikECUNi4T19DnBpquBzBHlmfnGBtHPkq1KF7mNhdLhD28Atn0gpOGZOnd - VzV9iEYEExECAAYFAlsnulUACgkQOzARt2udZSO/4QCcDf+j/XRbJn2PudsSoyjw - 3B2boakAnA9A9b8UoEYgmLTRpwXYuhsxOCDE - =eJaK - -----END PGP PUBLIC KEY BLOCK----- - -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 - -runcmd: - # HACK: cloud-init in Debian 11 does not take care of the following - - echo "PermitRootLogin yes" >> /etc/ssh/sshd_config - - systemctl restart sshd - # WORKAROUND: security release/updates does not have a Release file - - sed -i "s|bullseye/updates|bullseye-security|" /etc/apt/sources.list -%{ if install_salt_bundle } - - "DEBIAN_FRONTEND=noninteractive apt-get -yq update" - - "DEBIAN_FRONTEND=noninteractive apt-get -yq install venv-salt-minion avahi-daemon qemu-guest-agent gnupg python3-apt" -%{ else } - - "DEBIAN_FRONTEND=noninteractive apt-get -yq update" - - "DEBIAN_FRONTEND=noninteractive apt-get -yq install salt-minion avahi-daemon qemu-guest-agent gnupg python3-apt" -%{ endif } - - systemctl start qemu-guest-agent -%{ endif } - %{ if image == "amazonlinux2o" } yum_repos: diff --git a/modules/controller/main.tf b/modules/controller/main.tf index 566372156..e42ab7ebb 100644 --- a/modules/controller/main.tf +++ b/modules/controller/main.tf @@ -127,8 +127,6 @@ module "controller" { ubuntu2204_sshminion = length(var.ubuntu2204_sshminion_configuration["hostnames"]) > 0 ? var.ubuntu2204_sshminion_configuration["hostnames"][0] : null ubuntu2404_minion = length(var.ubuntu2404_minion_configuration["hostnames"]) > 0 ? var.ubuntu2404_minion_configuration["hostnames"][0] : null ubuntu2404_sshminion = length(var.ubuntu2404_sshminion_configuration["hostnames"]) > 0 ? var.ubuntu2404_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 sle12sp5_buildhost = length(var.sle12sp5_buildhost_configuration["hostnames"]) > 0 ? var.sle12sp5_buildhost_configuration["hostnames"][0] : null diff --git a/modules/controller/variables.tf b/modules/controller/variables.tf index 75317cb89..e4ecb0bf9 100644 --- a/modules/controller/variables.tf +++ b/modules/controller/variables.tf @@ -526,20 +526,6 @@ variable "ubuntu2404_sshminion_configuration" { } } -variable "debian11_minion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - -variable "debian11_sshminion_configuration" { - description = "use module..configuration, see main.tf.libvirt-testsuite.example" - default = { - hostnames = [] - } -} - variable "debian12_minion_configuration" { description = "use module..configuration, see main.tf.libvirt-testsuite.example" default = { diff --git a/salt/controller/bashrc b/salt/controller/bashrc index 776fe39ed..36abfdc6c 100644 --- a/salt/controller/bashrc +++ b/salt/controller/bashrc @@ -82,8 +82,6 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host 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('ubuntu2404_minion') | default(false, true) %}export UBUNTU2404_MINION="{{ grains.get('ubuntu2404_minion') }}" {% else %}# no UBUNTU2404 minion defined {% endif %} {% if grains.get('ubuntu2404_sshminion') | default(false, true) %}export UBUNTU2404_SSHMINION="{{ grains.get('ubuntu2404_sshminion') }}" {% else %}# no UBUNTU2404 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 %} {% if grains.get('debian12_sshminion') | default(false, true) %}export DEBIAN12_SSHMINION="{{ grains.get('debian12_sshminion') }}" {% else %}# no DEBIAN12 ssh minion defined {% endif %} {% if grains.get('sle15sp4_buildhost') | default(false, true) %}export SLE15SP4_BUILDHOST="{{ grains.get('sle15sp4_buildhost') }}" {% else %}# no SLE15SP4 buildhost defined {% endif %} diff --git a/salt/mirror/etc/minima.yaml b/salt/mirror/etc/minima.yaml index 4f8014199..1cc635862 100644 --- a/salt/mirror/etc/minima.yaml +++ b/salt/mirror/etc/minima.yaml @@ -260,10 +260,6 @@ http: - url: https://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.3:/Ubuntu24.04-SUSE-Manager-Tools/xUbuntu_24.04/ 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] - # SLE 12 (GA and all SPs) Manager Tools Head devel - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head:/SLE12-SUSE-Manager-Tools/images/repo/SLE-12-Manager-Tools-Beta-POOL-x86_64-Media1 archs: [x86_64] @@ -380,8 +376,6 @@ http: archs: [amd64] - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/Ubuntu2404-Uyuni-Client-Tools/xUbuntu_24.04/ archs: [amd64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/Debian11-Uyuni-Client-Tools/Debian_11/ - archs: [amd64] - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/Debian12-Uyuni-Client-Tools/Debian_12/ archs: [amd64] @@ -412,7 +406,5 @@ http: archs: [amd64] - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2404-Uyuni-Client-Tools/xUbuntu_24.04/ archs: [amd64] - - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Debian11-Uyuni-Client-Tools/Debian_11/ - archs: [amd64] - url: http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Debian12-Uyuni-Client-Tools/Debian_12/ archs: [amd64]