Update AWS sumaform deployment for 5.1 Payg

maximenoel8 · maximenoel8 · commit 6dbc654c72df · 2025-10-30T09:25:53.000+13:00
diff --git a/backend_modules/aws/base/ami.tf b/backend_modules/aws/base/ami.tf
@@ -221,7 +221,7 @@ data "aws_ami" "suma-proxy-50-x86_64-byos" {
 
 data "aws_ami" "smlm-server-51-x86_64-ltd-paygo" {
   most_recent = true
-  name_regex  = "^suse-mlm-server-5-1-ltd-v[0-9].*$"
+  name_regex  = "^suse-manager-server-5-1-v[0-9].*(ltd).*$"
   owners      = ["679593333241"]
 
   filter {
@@ -241,14 +241,14 @@ data "aws_ami" "smlm-server-51-x86_64-ltd-paygo" {
 
   filter {
     name   = "product-code"
-    values = ["8ysfelcfs2dkok3fba4s5uqo4"]
+    values = ["c48fapw1f0e4tvjukevqlbmf4"]
   }
 }
 
 
 data "aws_ami" "smlm-server-51-arm64-ltd-paygo" {
   most_recent = true
-  name_regex  = "^suse-mlm-server-5-1-ltd-v[0-9].*$"
+  name_regex  = "^suse-manager-server-5-1-v[0-9].*(ltd).*$"
   owners      = ["679593333241"]
 
   filter {
@@ -268,14 +268,14 @@ data "aws_ami" "smlm-server-51-arm64-ltd-paygo" {
 
   filter {
     name   = "product-code"
-    values = ["eheergy88522f5m8bqg7cp261"]
+    values = ["umnofojstehgl6jnp9nspg7g"]
   }
 }
 
 data "aws_ami" "smlm-proxy-51-arm64-byos" {
   most_recent = true
-  name_regex  = "^suse-mlm-proxy-5-1-byos-v"
-  owners      = ["810320120389"]
+  name_regex  = "^suse-manager-proxy-5-1-byos-v"
+  owners      = ["679593333241"]
 
   filter {
     name   = "architecture"
@@ -291,12 +291,18 @@ data "aws_ami" "smlm-proxy-51-arm64-byos" {
     name   = "root-device-type"
     values = ["ebs"]
   }
+
+
+  filter {
+    name   = "product-code"
+    values = ["713zi40zqboecsjmlxkf31iin"]
+  }
 }
 
 data "aws_ami" "smlm-proxy-51-x86_64-byos" {
   most_recent = true
-  name_regex  = "^suse-mlm-proxy-5-1-byos-v"
-  owners      = ["810320120389"]
+  name_regex  = "^suse-manager-proxy-5-1-byos-v"
+  owners      = ["679593333241"]
 
   filter {
     name   = "architecture"
@@ -312,6 +318,11 @@ data "aws_ami" "smlm-proxy-51-x86_64-byos" {
     name   = "root-device-type"
     values = ["ebs"]
   }
+
+  filter {
+    name   = "product-code"
+    values = ["q26lvbne2lnivd97mlx43j4u"]
+  }
 }
 
 
diff --git a/backend_modules/aws/host/combustion b/backend_modules/aws/host/combustion
@@ -39,19 +39,18 @@ nm_config 2 eth1 manual
 # Set linux as password for root
 echo 'root:$6$3aQC9rrDLHiTf1yR$NoKe9tko0kFIpu0rQ2y/OzOOtbVvs0Amr2bx0T4cGf6aq8PG74EmVy8lSDJdbLVVFpOSzwELWyReRCiPHa7DG0' | chpasswd -e
 
-# 5.1 --> SL micro 6.1
-%{ if product_version == "5.1-paygo" }
+%{ if sshd_config_root_d }
 echo "PermitRootLogin yes" > /etc/ssh/sshd_config.d/root.conf
 echo "ChallengeResponseAuthentication yes" >> /etc/ssh/sshd_config.d/root.conf
 %{ else }
-# 5.0 --> SLE Micro 5.5
 echo "PermitRootLogin yes" > /etc/ssh/sshd_config
 echo "ChallengeResponseAuthentication yes" >> /etc/ssh/sshd_config
 echo "PasswordAuthentication yes" >> /etc/ssh/sshd_config
 %{ endif }
 
 # Add a public ssh key and enable sshd
 echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGEPA8UvZ/6tTiL+MKGUAsHJuPlDpueeDmbuJ+0giOCY root@controller" > /root/.ssh/authorized_keys
+echo "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFY000UPEvRSkiNiOXExo6JGB/lJA+tGPqBsl9k5/hzb" >> /root/.ssh/authorized_keys
 
 systemctl enable sshd.service
 systemctl restart sshd.service
diff --git a/backend_modules/aws/host/main.tf b/backend_modules/aws/host/main.tf
@@ -54,17 +54,19 @@ locals {
   ]
   // manually provided AMIs for to-be-released images all start with 'ami-'
   combustion = contains(local.combustion_images, var.image) || substr(var.image, 0, 3) == "ami"
+  sshd_config_root_d = can(regex("51", var.image))
 
   user_data = templatefile("${path.module}/user_data.yaml", {
     image                    = var.image
-    public_instance          = local.provider_settings["public_instance"]
+    public_instance          = tostring(local.provider_settings["public_instance"])
     mirror_url               = var.base_configuration["mirror"]
     install_salt_bundle      = var.install_salt_bundle
   })
 
   combustion_file = templatefile("${path.module}/combustion", {
     product_version          = local.product_version
     install_salt_bundle      = var.install_salt_bundle
+    sshd_config_root_d       = local.sshd_config_root_d
   })
 }
 
@@ -237,7 +239,7 @@ resource "null_resource" "host_salt_configuration" {
         authorized_keys           = var.ssh_key_path
         gpg_keys                  = var.gpg_keys
         ipv6                      = var.ipv6
-    })
+      })
   }
 
   connection {
@@ -294,6 +296,7 @@ resource "null_resource" "host_salt_configuration" {
 
   provisioner "remote-exec" {
     inline = [
+      "echo 'Attempting to run wait_for_salt.sh' 2>&1",
       "sudo bash /tmp/salt/wait_for_salt.sh",
     ]
   }
diff --git a/modules/mirror/main.tf b/modules/mirror/main.tf
@@ -7,7 +7,7 @@ module "mirror" {
   use_os_released_updates = var.use_os_released_updates
   install_salt_bundle     = var.install_salt_bundle
   additional_repos        = var.additional_repos
-  additional_repos_only         = var.additional_repos_only
+  additional_repos_only   = var.additional_repos_only
   additional_packages     = var.additional_packages
   swap_file_size          = var.swap_file_size
   ssh_key_path            = var.ssh_key_path
diff --git a/modules/server/main.tf b/modules/server/main.tf
@@ -44,7 +44,7 @@ module "server" {
   additional_disk_size          = var.repository_disk_size
   second_additional_disk_size   = var.database_disk_size
   volume_provider_settings      = var.volume_provider_settings
-  product_version               = var.product_version
+  product_version               = local.product_version
   provision                     = var.provision
 
   grains = {
diff --git a/modules/server_containerized/main.tf b/modules/server_containerized/main.tf
@@ -43,6 +43,7 @@ module "server_containerized" {
   additional_disk_size          = var.repository_disk_size
   second_additional_disk_size   = var.database_disk_size
   volume_provider_settings      = var.volume_provider_settings
+  product_version               = local.product_version
 
   grains = {
     container_runtime              = var.runtime
diff --git a/salt/default/minimal.sls b/salt/default/minimal.sls
@@ -6,10 +6,11 @@ include:
   - default.firewall
   {% if 'build_image' not in grains.get('product_version', '') and 'paygo' not in grains.get('product_version', '') %}
   - repos
+  - scc
+  - default.avahi
   {% else %}
   - repos.testsuite
   {% endif %}
-  - default.avahi
   - default.time
 
 minimal_package_update:
diff --git a/salt/minion/init.sls b/salt/minion/init.sls
@@ -1,6 +1,6 @@
 include:
-  - scc.minion
   {% if 'paygo' not in grains.get('product_version') | default('', true) %}
+  - scc.minion
   - repos
   {% endif %}
   - minion.testsuite
diff --git a/salt/mirror/configuration.sls b/salt/mirror/configuration.sls
@@ -17,8 +17,8 @@ tar:
 minima:
   archive.extracted:
     - name: /usr/local/bin/utils/
-    - source: https://github.com/uyuni-project/minima/releases/download/v0.11/minima-linux-amd64.tar.gz
-    - source_hash: https://github.com/uyuni-project/minima/releases/download/v0.11/minima-linux-amd64.tar.gz.sha512
+    - source: https://github.com/uyuni-project/minima/releases/download/v0.25/minima_0.25_linux_amd64.tar.gz
+    - source_hash: 06c2939868bd02b0328d380e04d7e10c194f0e5eec7ddb12c546ba2513942448a169d103147cc31c7faec4bb89ccba139f28692a2bf69f6b650be92de2f229ce
     - archive_format: tar
     - enforce_toplevel: false
     - keep: True
@@ -35,8 +35,8 @@ apt-mirror:
 jdupes:
   archive.extracted:
     - name: /usr/local/bin/utils/
-    - source: https://codeberg.org/jbruchon/jdupes/releases/download/v1.27.3/jdupes-1.27.3-linux-x86_64.pkg.tar.xz
-    - source_hash: d59159e3ceb263dbff465a7f2115ab9730c90a651b2aba62f95da957ec26891a0f5e83380f5e7629adf9d4b5ab8e64a54698b6f8c023eb0c5f8cf048ada29b07
+    - source: https://codeberg.org/jbruchon/jdupes/releases/download/v1.31.1/jdupes-1.31.1-linux-x86_64.pkg.tar.xz
+    - source_hash: 38bdd7d6269d9acb0fad93168a691fb1718651a7de34f1bbd5384b65a23a3d45290adae9e56340dfb0b9d32d2bf261861da75ac44bf4fece64acbfbb18d00c0c
     - archive_format: tar
     - enforce_toplevel: false
     - options: --strip-components=3 --wildcards */jdupes
diff --git a/salt/mirror/etc/minimum_repositories_testsuite.yaml b/salt/mirror/etc/minimum_repositories_testsuite.yaml
@@ -13,25 +13,25 @@ http:
   - url: http://dist.nue.suse.com/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/
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2004-Uyuni-Client-Tools/xUbuntu_20.04/
     archs: [amd64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2204-Uyuni-Client-Tools/xUbuntu_22.04/
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2204-Uyuni-Client-Tools/xUbuntu_22.04/
     archs: [amd64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/Ubuntu2404-Uyuni-Client-Tools/xUbuntu_24.04/
+  - url:  http://downloadcontent.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/
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/deb/
     archs: [amd64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/
     archs: [x86_64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/deb
     archs: [amd64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/rpm
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Updates/rpm
     archs: [x86_64]
 
   - url:  http://dist.nue.suse.com/ibs/SUSE/Updates/SLE-Manager-Tools/12/x86_64/update/
@@ -46,7 +46,7 @@ http:
   - url:  http://dist.nue.suse.com/ibs/SUSE/Products/SLE-Manager-Tools/15/x86_64/product/
     archs: [x86_64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/SLE15-Uyuni-Client-Tools/SLE_15/
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Stable:/SLE15-Uyuni-Client-Tools/SLE_15/
     archs: [x86_64]
 
   - url:  http://dist.nue.suse.com/ibs/SUSE/Updates/RES/7-CLIENT-TOOLS/x86_64/update/
@@ -58,23 +58,29 @@ http:
   - url: http://dist.nue.suse.com/ibs/SUSE/Products/RES/8-CLIENT-TOOLS/x86_64/product/
     archs: [ x86_64 ]
 
-  - url:  http://dist.nue.suse.com/ibs/SUSE/Products/SLE-Manager-Tools/15-BETA/x86_64/product/
+  - url:  http://dist.nue.suse.com/ibs/SUSE/Updates/SLE-Manager-Tools/15/x86_64/update/
     archs: [x86_64]
 
-  - url:  http://dist.nue.suse.com/ibs/SUSE/Products/SLE-Manager-Tools/15-BETA/x86_64/update/
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_15_SP3/
     archs: [x86_64]
 
-  - url:  http://dist.nue.suse.com/ibs/SUSE/Updates/SLE-Manager-Tools/15/x86_64/update/
+  - url:  http://downloadcontent.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/openSUSE_Leap_15-Uyuni-Client-Tools/openSUSE_Leap_15.0/
     archs: [x86_64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/sumaform:/tools/SLE_15_SP3/
+  - url:  http://dist.nue.suse.com/ibs/SUSE/Products/EL/9-CLIENT-TOOLS/x86_64/product/
     archs: [x86_64]
 
-  - url:  http://download.opensuse.org/repositories/systemsmanagement:/Uyuni:/Master:/openSUSE_Leap_15-Uyuni-Client-Tools/openSUSE_Leap_15.0/
+  - url:  http://dist.nue.suse.com/ibs/SUSE/Updates/EL/9-CLIENT-TOOLS/x86_64/update/
     archs: [x86_64]
 
-  - url:  http://dist.nue.suse.com/ibs/SUSE/Products/EL/9-CLIENT-TOOLS/x86_64/product/
+  - url:  http://dist.nue.suse.com/ibs/SUSE/Products/MultiLinuxManagerTools/SLE-15/x86_64/product/
     archs: [x86_64]
 
-  - url:  http://dist.nue.suse.com/ibs/SUSE/Updates/EL/9-CLIENT-TOOLS/x86_64/update/
+  - url: http://dist.nue.suse.com/ibs/SUSE/Updates/MultiLinuxManagerTools/SLE-15/x86_64/update
+    archs: [ x86_64 ]
+
+  - url:  http://dist.nue.suse.com/ibs/SUSE/Products/MultiLinuxManagerTools/SLE-12/x86_64/product/
     archs: [x86_64]
+
+  - url: http://dist.nue.suse.com/ibs/SUSE/Updates/MultiLinuxManagerTools/SLE-12/x86_64/update/
+    archs: [ x86_64 ]
diff --git a/salt/repos/client_tools/client_tools_mlm.sls b/salt/repos/client_tools/client_tools_mlm.sls
@@ -1,7 +1,7 @@
 {# These states set up client tools repositories for all supported OSes #}
 {% set product_version = grains.get('product_version') | default('', true) %}
 {% if '5.1' in product_version or 'head' in product_version %}
-{% if not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles') and 'server_containerized' not in grains.get('roles') and 'proxy_containerized' not in grains.get('roles')) %}
+{% if not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles') and 'server_containerized' not in grains.get('roles') and 'proxy_containerized' not in grains.get('roles') and 'controller' not in grains.get('roles')) %}
 {# no client tools on server, proxy, server_containerized, or proxy_containerized #}
 
 {% if grains['os'] == 'SUSE' %}
diff --git a/salt/repos/client_tools/client_tools_suma.sls b/salt/repos/client_tools/client_tools_suma.sls
@@ -1,7 +1,7 @@
 {# These states set up client tools repositories for all supported OSes #}
 {% set product_version = grains.get('product_version') | default('', true) %}
 {% if '4.3' in product_version or '5.0' in product_version %}
-{% if not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles') and 'server_containerized' not in grains.get('roles') and 'proxy_containerized' not in grains.get('roles')) %}
+{% if not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles') and 'server_containerized' not in grains.get('roles') and 'proxy_containerized' not in grains.get('roles') and 'controller' not in grains.get('roles')) %}
 {# no client tools on server, proxy, server_containerized, or proxy_containerized #}
 
 ## Important note: 4.3 and 5.0 are sharing the same client tools
diff --git a/salt/repos/client_tools/client_tools_uyuni.sls b/salt/repos/client_tools/client_tools_uyuni.sls
@@ -1,6 +1,6 @@
 {# These states set up client tools repositories for all supported OSes #}
 {% if 'uyuni' in grains.get('product_version') | default('', true) %}
-{% if not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles') and 'server_containerized' not in grains.get('roles') and 'proxy_containerized' not in grains.get('roles')) %}
+{% if not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles') and 'server_containerized' not in grains.get('roles') and 'proxy_containerized' not in grains.get('roles') and 'controller' not in grains.get('roles')) %}
 {# no client tools on server, proxy, server_containerized, or proxy_containerized #}
 
 {% set uyuni_version = 'Master' if grains.get('product_version', '') == 'uyuni-master' else 'Stable' %}
diff --git a/salt/repos/testsuite.sls b/salt/repos/testsuite.sls
@@ -24,6 +24,15 @@ test_repo_rpm_pool:
     - refresh: True
     - gpgcheck: 1
     - gpgkey: http://{{ grains.get("mirror") | default("downloadcontent.opensuse.org", true) }}/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/repodata/repomd.xml.key
+    - keys:
+        - http://{{ grains.get("mirror") | default("downloadcontent.opensuse.org", true) }}/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/repodata/repomd.xml.key
+
+{% if (grains['osfinger'] == "SLES-12") %}
+refresh_test_repos:
+  cmd.run:
+    - name: zypper --non-interactive --gpg-auto-import-keys refresh --force; exit 0
+{% endif %}
+
 {% endif %} {# already added via combustion #}
 
 {% elif grains['os_family'] == 'Debian' %}
diff --git a/salt/scc/init.sls b/salt/scc/init.sls
@@ -1,3 +1,4 @@
+{% if 'paygo' not in grains.get('product_version') | default('', true) %}
 {% if (grains.get('server_registration_code') or grains.get('proxy_registration_code') or grains.get('sles_registration_code')) and grains['os'] == 'SUSE' %}
 include:
   - scc.clean
@@ -11,3 +12,4 @@ scc_refresh_repos:
   cmd.run:
     - name: zypper --non-interactive --gpg-auto-import-keys refresh --force; exit 0
 {% endif %}
+{% endif %}
diff --git a/salt/server/additional_disk.sls b/salt/server/additional_disk.sls
@@ -23,7 +23,7 @@ spacewalk_directory:
 {% else %}
 
 {% set fstype = grains.get('data_disk_fstype') | default('ext4', true) %}
-{% if grains['data_disk_device'] == "nvme1n1" %}
+{% if grains['data_disk_device'] == "nvme0n1" %}
 {% set partition_name = '/dev/' + grains['data_disk_device'] + 'p1' %}
 {% else %}
 {% set partition_name = '/dev/' + grains['data_disk_device'] + '1' %}
