Add SLES 15 SP6

README.md

@@ -151,6 +151,7 @@ module "base" {
     "opensuse155o",
     "sles15sp4o",
     "sles15sp5o",
+    "sles15sp6o",
     "sles12sp5o",
     "ubuntu2004o",
     "ubuntu2204o"

backend_modules/aws/base/ami.tf

@@ -124,6 +124,48 @@ data "aws_ami" "sles15sp5-paygo" {
   }
 }
 
+data "aws_ami" "sles15sp6o" {
+  most_recent = true
+  name_regex  = "^suse-sles-15-sp6-byos-v"
+  owners      = ["679593333241"]
+
+  filter {
+    name   = "architecture"
+    values = ["x86_64"]
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  filter {
+    name   = "root-device-type"
+    values = ["ebs"]
+  }
+}
+
+data "aws_ami" "sles15sp6-paygo" {
+  most_recent = true
+  name_regex  = "^suse-sles-15-sp6-v[0-9]*-hvm"
+  owners      = ["013907871322"] // aws-marketplace
+
+  filter {
+    name   = "architecture"
+    values = ["x86_64"]
+  }
+
+  filter {
+    name   = "virtualization-type"
+    values = ["hvm"]
+  }
+
+  filter {
+    name   = "root-device-type"
+    values = ["ebs"]
+  }
+}
+
 data "aws_ami" "suma-server-43-byos" {
   most_recent = true
   name_regex  = "^suse-manager-server-4-3-byos-v"

backend_modules/aws/base/main.tf

@@ -74,6 +74,8 @@ locals {
       sles15sp5o           = { ami = data.aws_ami.sles15sp5o.image_id },
       sles15sp5-paygo      = { ami = data.aws_ami.sles15sp5-paygo.image_id },
       slesforsap15sp5-paygo= { ami = data.aws_ami.slesforsap15sp5-paygo.image_id },
+      sles15sp6o           = { ami = data.aws_ami.sles15sp6o.image_id },
+      sles15sp6-paygo      = { ami = data.aws_ami.sles15sp6-paygo.image_id },
       suma-server-43-byos  = { ami = data.aws_ami.suma-server-43-byos.image_id },
       suma-server-43-ltd-paygo = { ami = data.aws_ami.suma-server-43-ltd-paygo.image_id },
       suma-server-43-llc-paygo = { ami = data.aws_ami.suma-server-43-llc-paygo.image_id },

backend_modules/aws/host/user_data.yaml

@@ -60,7 +60,7 @@ runcmd:
 
 %{ endif }
 
-%{ if image == "sles15sp4o" || image == "sles15sp5o" }
+%{ if image == "sles15sp4o" || image == "sles15sp5o" || image == "sles15sp6o" }
 runcmd:
   - zypper addrepo -G -e http://download.opensuse.org/repositories/systemsmanagement:/saltstack:/products/SLE_15/ salt_test
   - zypper ref
@@ -71,7 +71,7 @@ packages: ["salt-minion"]
 
 %{ endif }
 
-%{ if image == "sles15sp5-paygo" || image == "sles12sp5-paygo" || image == "slesforsap15sp5-paygo" }
+%{ if image == "sles15sp5-paygo" || image == "sles12sp5-paygo" || image == "slesforsap15sp5-paygo" || image == "sles15sp6-paygo" }
 packages: ["salt-minion"]
 
 %{ endif }

backend_modules/azure/base/main.tf

@@ -52,6 +52,13 @@ data "azurerm_platform_image" "sles15sp5o" {
   sku       = "gen2"
 }
 
+data "azurerm_platform_image" "sles15sp6o" {
+  location  = local.location
+  publisher = "suse"
+  offer     = "sles-15-sp6-byos"
+  sku       = "gen2"
+}
+
 data "azurerm_platform_image" "centos7" {
   location  = local.location
   publisher = "OpenLogic"
@@ -145,6 +152,7 @@ locals {
       opensuse155o = { platform_image = data.azurerm_platform_image.opensuse155o },
       sles15sp4o   = { platform_image = data.azurerm_platform_image.sles15sp4o },
       sles15sp5o   = { platform_image = data.azurerm_platform_image.sles15sp5o },
+      sles15sp6o   = { platform_image = data.azurerm_platform_image.sles15sp6o },
       sles12sp5o   = { platform_image = data.azurerm_platform_image.sles12sp5o },
       centos7      = { platform_image = data.azurerm_platform_image.centos7 },
       ubuntu2004   = { platform_image = data.azurerm_platform_image.ubuntu2004 },

backend_modules/azure/host/user_data.yaml

@@ -109,14 +109,27 @@ zypper:
   repos:
     - id: salt_qubes_build
       name: salt_qubes_build
-      baseurl: https://download.opensuse.org/repositories/home:/wicked:/qubes-build/SLE_15_SP5/
+      baseurl: https://download.opensuse.org/repositories/home:/wicked:/qubes-build/SLE_15_SP4/
       enabled: 1
       autorefresh: 1
 
 packages: ["salt-minion"]
 
 %{ endif }
+
+%{ if image == "sles15sp6o" }
+zypper:
+  repos:
+    - id: salt_qubes_build
+      name: salt_qubes_build
+      baseurl: https://download.opensuse.org/repositories/home:/wicked:/qubes-build/SLE_15_SP4/
+      enabled: 1
+      autorefresh: 1
 
+packages: ["salt-minion"]
+
+%{ endif }
+
 %{ if image == "sles12sp3"}
 zypper:
   repos:

backend_modules/libvirt/base/main.tf

@@ -29,6 +29,7 @@ locals {
     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-TEST/SLES15-SP6-Minimal-VM.x86_64-Cloud-Build6.64.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"

backend_modules/libvirt/host/user_data.yaml

@@ -340,6 +340,32 @@ runcmd:
   - "systemctl start 'qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0'"
 %{ endif }
 
+%{ if image == "sles15sp6o" }
+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-SP6/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 SP6 does not take care of the following
+  # TODO: Check!
+  - "systemctl start 'qemu-ga@virtio\\x2dports-org.qemu.guest_agent.0'"
+%{ endif }
+
 %{ if image == "slemicro55o" }
 
 write_files: ${ files }

modules/controller/main.tf

@@ -67,6 +67,7 @@ module "controller" {
 
     sle12sp5_paygo_minion    = length(var.sle12sp5_paygo_minion_configuration["hostnames"]) > 0 ? var.sle12sp5_paygo_minion_configuration["hostnames"][0] : null
     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
@@ -96,6 +97,9 @@ module "controller" {
     sle15sp5_client      = length(var.sle15sp5_client_configuration["hostnames"]) > 0 ? var.sle15sp5_client_configuration["hostnames"][0] : null
     sle15sp5_minion      = length(var.sle15sp5_minion_configuration["hostnames"]) > 0 ? var.sle15sp5_minion_configuration["hostnames"][0] : null
     sle15sp5_sshminion   = length(var.sle15sp5_sshminion_configuration["hostnames"]) > 0 ? var.sle15sp5_sshminion_configuration["hostnames"][0] : null
+    sle15sp6_client      = length(var.sle15sp6_client_configuration["hostnames"]) > 0 ? var.sle15sp6_client_configuration["hostnames"][0] : null
+    sle15sp6_minion      = length(var.sle15sp6_minion_configuration["hostnames"]) > 0 ? var.sle15sp6_minion_configuration["hostnames"][0] : null
+    sle15sp6_sshminion   = length(var.sle15sp6_sshminion_configuration["hostnames"]) > 0 ? var.sle15sp6_sshminion_configuration["hostnames"][0] : null
     slemicro51_minion    = length(var.slemicro51_minion_configuration["hostnames"]) > 0 ? var.slemicro51_minion_configuration["hostnames"][0] : null
     slemicro51_sshminion = length(var.slemicro51_sshminion_configuration["hostnames"]) > 0 ? var.slemicro51_sshminion_configuration["hostnames"][0] : null
     slemicro52_minion    = length(var.slemicro52_minion_configuration["hostnames"]) > 0 ? var.slemicro52_minion_configuration["hostnames"][0] : null

modules/controller/variables.tf

@@ -135,14 +135,20 @@ variable "sle15sp5_paygo_minion_configuration" {
   }
 }
 
+variable "sle15sp6_paygo_minion_configuration" {
+  description = "use module.<SLE15SP6_PAYGO_MINION>.configuration, see main.tf.libvirt-testsuite.example"
+  default = {
+    hostnames = []
+  }
+}
+
 variable "sleforsap15sp5_paygo_minion_configuration" {
   description = "use module.<SLEFORSAP15SP5_PAYGO_MINION>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
     hostnames = []
   }
 }
 
-
 variable "sle11sp4_minion_configuration" {
   description = "use module.<SLE11SP4_MINION>.configuration, see main.tf.libvirt-testsuite.example"
   default = {
@@ -332,6 +338,27 @@ variable "sle15sp5_client_configuration" {
   }
 }
 
+variable "sle15sp6_minion_configuration" {
+  description = "use module.<SLE15SP6_MINION>.configuration, see main.tf.libvirt-testsuite.example"
+  default = {
+    hostnames = []
+  }
+}
+
+variable "sle15sp6_sshminion_configuration" {
+  description = "use module.<SLE15SP6_SSHMINION>.configuration, see main.tf.libvirt-testsuite.example"
+  default = {
+    hostnames = []
+  }
+}
+
+variable "sle15sp6_client_configuration" {
+  description = "use module.<SLE15SP6_CLIENT>.configuration, see main.tf.libvirt-testsuite.example"
+  default = {
+    hostnames = []
+  }
+}
+
 variable "slemicro51_minion_configuration" {
   description = "use module.<SLEMICRO51_MINION>.configuration, see main.tf.libvirt-testsuite.example"
   default = {

modules/server_containerized/variables.tf

@@ -271,7 +271,7 @@ variable "connect_to_additional_network" {
 }
 
 variable "image" {
-  description = "An image name, e.g. sles15sp5 or opensuse155o"
+  description = "An image name, e.g. slemicro55o or leapmicro55o"
   type        = string
   default     = "default"
 }

salt/controller/bashrc

@@ -24,6 +24,7 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host defined {% endif %}
 # BV clients
 {% if grains.get('sle12sp5_paygo_minion') | default(false, true) %}export SLE12SP5_PAYGO_MINION="{{ grains.get('sle12sp5_paygo_minion') }}" {% else %}# no SLE12SP5_PAYGO minion 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 %}
@@ -53,6 +54,9 @@ export VIRTHOST_KVM_PASSWORD="linux" {% else %}# no KVM host defined {% endif %}
 {% if grains.get('sle15sp5_client') | default(false, true) %}export SLE15SP5_CLIENT="{{ grains.get('sle15sp5_client') }}" {% else %}# no SLE15SP5 client defined {% endif %}
 {% if grains.get('sle15sp5_minion') | default(false, true) %}export SLE15SP5_MINION="{{ grains.get('sle15sp5_minion') }}" {% else %}# no SLE15SP5 minion defined {% endif %}
 {% if grains.get('sle15sp5_sshminion') | default(false, true) %}export SLE15SP5_SSHMINION="{{ grains.get('sle15sp5_sshminion') }}" {% else %}# no SLE15SP5 ssh minion defined {% endif %}
+{% if grains.get('sle15sp6_client') | default(false, true) %}export SLE15SP6_CLIENT="{{ grains.get('sle15sp6_client') }}" {% else %}# no SLE15SP6 client defined {% endif %}
+{% if grains.get('sle15sp6_minion') | default(false, true) %}export SLE15SP6_MINION="{{ grains.get('sle15sp6_minion') }}" {% else %}# no SLE15SP6 minion defined {% endif %}
+{% if grains.get('sle15sp6_sshminion') | default(false, true) %}export SLE15SP6_SSHMINION="{{ grains.get('sle15sp6_sshminion') }}" {% else %}# no SLE15SP6 ssh minion defined {% endif %}
 {% if grains.get('slemicro51_minion') | default(false, true) %}export SLEMICRO51_MINION="{{ grains.get('slemicro51_minion') }}" {% else %}# no SLEMICRO51 minion defined {% endif %}
 {% if grains.get('slemicro51_sshminion') | default(false, true) %}export SLEMICRO51_SSHMINION="{{ grains.get('slemicro51_sshminion') }}" {% else %}# no SLEMICRO51 ssh minion defined {% endif %}
 {% if grains.get('slemicro52_minion') | default(false, true) %}export SLEMICRO52_MINION="{{ grains.get('slemicro52_minion') }}" {% else %}# no SLEMICRO52 minion defined {% endif %}

salt/mirror/etc/minima.yaml

@@ -129,6 +129,34 @@ scc:
     - SLE-Module-Desktop-Applications15-SP4-Updates
     - SLE-Module-DevTools15-SP4-Pool
     - SLE-Module-DevTools15-SP4-Updates
+    # SLE 15-SP5 Products
+    - SLE-Product-SLES15-SP5-Pool
+    - SLE-Product-SLES15-SP5-Updates
+    # SLE 15-SP5 Basic Modules
+    - SLE-Module-Basesystem15-SP5-Pool
+    - SLE-Module-Basesystem15-SP5-Updates
+    - SLE-Module-Server-Applications15-SP5-Pool
+    - SLE-Module-Server-Applications15-SP5-Updates
+    - SLE-Module-Web-Scripting15-SP5-Pool
+    - SLE-Module-Web-Scripting15-SP5-Updates
+    - SLE-Module-Desktop-Applications15-SP5-Pool
+    - SLE-Module-Desktop-Applications15-SP5-Updates
+    - SLE-Module-DevTools15-SP5-Pool
+    - SLE-Module-DevTools15-SP5-Updates
+    # SLE 15-SP6 Products
+    - SLE-Product-SLES15-SP6-Pool
+    - SLE-Product-SLES15-SP6-Updates
+    # SLE 15-SP6 Basic Modules
+    - SLE-Module-Basesystem15-SP6-Pool
+    - SLE-Module-Basesystem15-SP6-Updates
+    - SLE-Module-Server-Applications15-SP6-Pool
+    - SLE-Module-Server-Applications15-SP6-Updates
+    - SLE-Module-Web-Scripting15-SP6-Pool
+    - SLE-Module-Web-Scripting15-SP6-Updates
+    - SLE-Module-Desktop-Applications15-SP6-Pool
+    - SLE-Module-Desktop-Applications15-SP6-Updates
+    - SLE-Module-DevTools15-SP6-Pool
+    - SLE-Module-DevTools15-SP6-Updates
     # SLE Legacy Module
     - SLE-Module-Legacy12-Pool
     - SLE-Module-Legacy12-Updates
@@ -276,7 +304,7 @@ http:
   - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Web-Scripting:/15-SP3:/x86_64/update
     archs: [x86_64]
 
-  # SLES 15 SP4 Test (not available until GM)
+  # SLES 15 SP4 Test
   - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Basesystem:/15-SP4:/x86_64/update
     archs: [x86_64]
   - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Containers:/15-SP4:/x86_64/update
@@ -292,7 +320,6 @@ http:
   - url: http://download.suse.de/ibs/SUSE:/Maintenance:/Test:/SLE-Module-Web-Scripting:/15-SP4:/x86_64/update
     archs: [x86_64]
 
-
   # SUSE Manager Head (SLE15-SP3)
   - url: http://download.suse.de/ibs/Devel:/Galaxy:/Manager:/Head/images/repo/SLE-Module-SUSE-Manager-Server-4.2-POOL-x86_64-Media1
     archs: [x86_64]

salt/repos/build_host.sls

@@ -27,6 +27,8 @@ containers_updates_repo:
 {% set sle_version_path = '15-SP4' %}
 {% elif grains['osrelease'] == '15.5' %}
 {% set sle_version_path = '15-SP5' %}
+{% elif grains['osrelease'] == '15.6' %}
+{% set sle_version_path = '15-SP6' %}
 {% endif %}
 
 cloud_pool_repo:

salt/repos/default.sls

@@ -429,6 +429,25 @@ os_update_repo:
 #    - refresh: True
 
 {% endif %} {# '15.5' == grains['osrelease'] #}
+
+{% if '15.6' == grains['osrelease'] and 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) ) %}
+os_pool_repo:
+  pkgrepo.managed:
+    - baseurl: http://{{ grains.get("mirror") | default("download.suse.de/ibs", true) }}/SUSE/Products/SLE-Module-Basesystem/15-SP6/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-SP6/x86_64/update/
+    - refresh: True
+
+  # uncomment when it goes LTSS
+  #os_ltss_repo:
+  #  pkgrepo.managed:
+  #    - baseurl: http://{{ grains.get("mirror") | default("download.suse.de", true) }}/ibs/SUSE/Updates/SLE-Product-SLES/15-SP6-LTSS/x86_64/update/
+  #    - refresh: True
+
+{% endif %} {# '15.6' == grains['osrelease'] #}
 {% endif %}{# grains['osfullname'] == 'SLES' #}
 
 {% if grains['osfullname'] == 'SLE Micro' and (not grains.get('roles') or ('server' not in grains.get('roles') and 'proxy' not in grains.get('roles'))) %}

salt/repos/virthost.sls

@@ -14,6 +14,8 @@
 {% set sle_version_path = '15-SP4' %}
 {% elif grains['osrelease'] == '15.5' %}
 {% set sle_version_path = '15-SP5' %}
+{% elif grains['osrelease'] == '15.6' %}
+{% set sle_version_path = '15-SP6' %}
 {% endif %}
 
 module_server_applications_pool_repo: