More occurrences of Ubuntu 24.04

uyuni-project · Oct 2, 2024 · afdf375 · afdf375
1 parent befc202
commit afdf375
Show file tree

Hide file tree

Showing 8 changed files with 68 additions and 15 deletions.
diff --git a/README_ADVANCED.md b/README_ADVANCED.md
@@ -185,7 +185,7 @@ module "mirror" {
   source = "./modules/mirror"
   base_configuration = module.base.configuration
 
-  ubuntu_distros = ['20.04', '22.04']
+  ubuntu_distros = ['20.04', '22.04', '24.04']
 }
 ```
 

diff --git a/backend_modules/aws/host/user_data.yaml b/backend_modules/aws/host/user_data.yaml
@@ -134,6 +134,47 @@ yum_repos:
 packages: ["venv-salt-minion"]
 %{ endif }
 
+%{ if image == "ubuntu2404" }
+
+apt:
+  sources:
+    tools_pool_repo:
+      source: deb http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2404-Uyuni-Client-Tools/xUbuntu_24.04/ /
+      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:
+  # WORKAROUND: cloud-init in Ubuntu 24.04 does not take care of the following
+  - echo "PermitRootLogin yes" >> /etc/ssh/sshd_config
+  # WORKAROUND: something in terraform is still using ssh-rsa
+  - echo "PubkeyAcceptedKeyTypes=+ssh-rsa" >> /etc/ssh/sshd_config
+  # WORKAROUND: disable IPv6 until we have it in Provo
+  - echo 'Acquire::ForceIPv4 "true";' > /etc/apt/apt.conf.d/99force-ipv4
+  - systemctl restart sshd
+
+
+packages: ["venv-salt-minion"]
+%{ endif }
 %{ if image == "ubuntu2204" }
 
 apt:

diff --git a/backend_modules/azure/base/main.tf b/backend_modules/azure/base/main.tf
@@ -108,11 +108,11 @@ data "azurerm_platform_image" "ubuntu2204" {
   sku       = "ubuntu-22-04-lts"
 }
 
-data "azurerm_platform_image" "suma42" {
+data "azurerm_platform_image" "ubuntu2404" {
   location  = local.location
-  publisher = "suse"
-  offer     = "manager-server-4-2-byos"
-  sku       = "gen2"
+  publisher = "cognosys"
+  offer     = "ubuntu-24-04-lts"
+  sku       = "ubuntu-24-04-lts"
 }
 
 data "azurerm_platform_image" "suma43" {

diff --git a/modules/mirror/variables.tf b/modules/mirror/variables.tf
@@ -38,7 +38,7 @@ variable "ssh_key_path" {
 }
 
 variable "ubuntu_distros" {
-  description = "List of Ubuntu versions to mirror among 20.04, 22.04"
+  description = "List of Ubuntu versions to mirror among 20.04, 22.04, 24.04"
   default     = []
 }
 

diff --git a/salt/mirror/etc/apt-mirror.list b/salt/mirror/etc/apt-mirror.list
@@ -7,7 +7,7 @@ set nthreads       20
 ## Sources
 ##
 
-{% set ubuntu_names = {'20.04': 'focal', '22.04': 'jammy'} %}
+{% set ubuntu_names = {'20.04': 'focal', '22.04': 'jammy', '24.04': 'noble'} %}
 
 {% for distro in grains['ubuntu_distros']|default([], true) %}
 {% set distro_name = ubuntu_names.get(distro, distro) %}

diff --git a/salt/mirror/etc/minima.yaml b/salt/mirror/etc/minima.yaml
@@ -145,6 +145,7 @@ scc:
       - RES8-Manager-Tools-Updates
       - Ubuntu-20.04-SUSE-Manager-Tools
       - Ubuntu-22.04-SUSE-Manager-Tools
+      - Ubuntu 24.04-SUSE-Manager-Tools
       # SUSE Manager Beta Tools
       - SLE-Manager-Tools12-Pool-Beta
       - SLE-Manager-Tools12-Updates-Beta
@@ -155,6 +156,7 @@ scc:
       - RES8-Manager-Tools-Updates-Beta
       - Ubuntu-20.04-SUSE-Manager-Tools-Beta
       - Ubuntu-22.04-SUSE-Manager-Tools-Beta
+      - Ubuntu-24.04-SUSE-Manager-Tools-Beta
     archs: [x86_64, amd64]
 
 http:
@@ -253,7 +255,9 @@ http:
   - url: https://download.suse.de/ibs/Devel:/Galaxy:/Manager:/4.3:/Ubuntu22.04-SUSE-Manager-Tools/xUbuntu_22.04/
     archs: [amd64]
 
-  # No Ubuntu 24.04 in 4.3
+  # Ubuntu 24.04 Manager Tools 4.3 devel
+  - 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/

diff --git a/salt/mirror/etc/minimum_repositories_testsuite.yaml b/salt/mirror/etc/minimum_repositories_testsuite.yaml
@@ -5,25 +5,31 @@ storage:
 http:
 
   - url:  http://download.suse.de/ibs/SUSE/Updates/Ubuntu/20.04-CLIENT-TOOLS/x86_64/update/
-    archs: [x86_64]
+    archs: [amd64]
 
   - url: http://download.suse.de/ibs/SUSE/Updates/Ubuntu/22.04-CLIENT-TOOLS/x86_64/update/
-    archs: [ x86_64 ]
+    archs: [amd64]
+
+  - url: http://download.suse.de/ibs/SUSE/Updates/Ubuntu/24.04-CLIENT-TOOLS/x86_64/update/
+    archs: [amd64]
 
   - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2004-Uyuni-Client-Tools/xUbuntu_20.04/
-    archs: [x86_64]
+    archs: [amd64]
 
   - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2204-Uyuni-Client-Tools/xUbuntu_22.04/
-    archs: [x86_64]
+    archs: [amd64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/
-    archs: [x86_64]
+  - 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:/Test-Packages:/Pool/deb/
+    archs: [amd64]
+
+  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/
     archs: [x86_64]
 
   - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb
-    archs: [x86_64]
+    archs: [amd64]
 
   - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/rpm
     archs: [x86_64]

diff --git a/salt/salt_testenv/salt_bundle_package.sls b/salt/salt_testenv/salt_bundle_package.sls
@@ -9,6 +9,8 @@
         {% set repo_path = 'Ubuntu_20.04' %}
     {% elif grains['osrelease'] == '22.04' %}
         {% set repo_path = 'Ubuntu_22.04' %}
+    {% elif grains['osrelease'] == '24.04' %}
+        {% set repo_path = 'Ubuntu_24.04' %}
     {% endif %}
 {% elif grains['osfullname'] == 'AlmaLinux' %}
     {% if grains['osrelease_info'][0] == 8 %}