add slmicro61o to sumaform

backend_modules/libvirt/base/main.tf

@@ -37,6 +37,7 @@ locals {
     slemicro54-ign           = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_54/SLE-Micro.x86_64-sumaform.qcow2"
     slemicro55o              = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_55/SLE-Micro.x86_64-sumaform.qcow2"
     slmicro60o               = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_60/SL-Micro.x86_64-sumaform.qcow2"
+    slmicro61o               = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/repositories/systemsmanagement:/sumaform:/images:/microos/images_61/SL-Micro.x86_64-sumaform.qcow2"
     suma43VM-ign             = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.suse.de"}/ibs/Devel:/Galaxy:/Manager:/4.3/images/SUSE-Manager-Server.x86_64-KVM-x86_64.qcow2"
     leapmicro55o             = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/distribution/leap-micro/5.5/appliances/openSUSE-Leap-Micro.x86_64-Default-qcow.qcow2"
     tumbleweedo              = "${var.use_mirror_images ? "http://${var.mirror}" : "http://download.opensuse.org"}/tumbleweed/appliances/openSUSE-Tumbleweed-Minimal-VM.x86_64-Cloud.qcow2"

backend_modules/libvirt/host/combustion

@@ -40,7 +40,7 @@ nm_config 2 eth1 manual
 echo 'root:$6$3aQC9rrDLHiTf1yR$NoKe9tko0kFIpu0rQ2y/OzOOtbVvs0Amr2bx0T4cGf6aq8PG74EmVy8lSDJdbLVVFpOSzwELWyReRCiPHa7DG0' | chpasswd -e
 
 # SL Micro6: Add PermitRootLogin to sshd config
-%{ if image == "slmicro60o" }
+%{ if image == "slmicro60o" || image == "slmicro61o" }
 echo "PermitRootLogin yes" > /etc/ssh/sshd_config.d/root.conf
 echo "ChallengeResponseAuthentication yes" >> /etc/ssh/sshd_config.d/root.conf
 %{ endif }
@@ -94,6 +94,33 @@ zypper ar http://${ use_mirror_images ? mirror : "download.opensuse.org" }/repos
 %{ endif }
 %{ endif } # end of image == "slmicro60o" block
 
+%{ if image == "slmicro61o" }
+zypper ar http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/SUSE/Products/SL-Micro/6.1/x86_64/product/ os_pool_repo
+
+# SL Micro 6.1 is being used in both Uyuni and SUSE Manager
+# we do not support yet Leap Micro 6.1, even in Uyuni
+%{ if product_version == "uyuni-master" || product_version == "uyuni-released" || product_version == "uyuni-pr" }
+zypper ar http://${ use_mirror_images ? mirror : "download.opensuse.org"}/repositories/systemsmanagement:/Uyuni:/Master:/SLMicro6-Uyuni-Client-Tools/SL-Micro6/ client_tools_repo
+%{ else }
+zypper ar http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/SUSE/Products/SUSE-Manager-Tools-For-SL-Micro/6/x86_64/product/ tools_pool_repo
+%{ endif }
+
+%{ if container_server || container_proxy }
+%{ if product_version == "uyuni-master" || product_version == "uyuni-pr" }
+zypper ar http://${ use_mirror_images ? mirror : "download.opensuse.org" }/repositories/systemsmanagement:/Uyuni:/Master:/ContainerUtils/openSUSE_Leap_16.0/ container_utils
+%{ else }
+zypper ar http://${ use_mirror_images ? mirror : "download.suse.de/ibs"}/Devel:/Galaxy:/Manager:/Head/images/repo/SUSE-Multi-Linux-Manager-Server-5.1-x86_64/ container_utils
+%{ endif }
+%{ endif }
+
+%{ if testsuite }
+zypper ar http://${ use_mirror_images ? mirror : "download.opensuse.org" }/repositories/systemsmanagement:/Uyuni:/Test-Packages:/Pool/rpm/ test_repo_rpm_pool
+
+# Leap repos are required to install expect
+zypper ar --no-gpgcheck http://${ use_mirror_images ? mirror : "download.opensuse.org" }/distribution/leap/16.0/repo/oss/ leap_pool_repo
+%{ endif }
+%{ endif } # end of image == "slmicro61o" block
+
 for i in ${additional_repos}; do
   name=$(echo $i | cut -d= -f1)
   url=$(echo $i | cut -d= -f2)

backend_modules/libvirt/host/main.tf

@@ -3,8 +3,8 @@ locals {
   resource_name_prefix = "${var.base_configuration["name_prefix"]}${var.name}"
   manufacturer = lookup(var.provider_settings, "manufacturer", "Intel")
   product      = lookup(var.provider_settings, "product", "Genuine")
-  x86_64_v2_images = ["almalinux9o", "libertylinux9o", "oraclelinux9o", "rocky9o", "slmicro60o"]
-  combustion_images  = ["leapmicro55o", "slmicro60o"]
+  x86_64_v2_images = ["almalinux9o", "libertylinux9o", "oraclelinux9o", "rocky9o", "slmicro60o", "slmicro61o"]
+  combustion_images  = ["leapmicro55o", "slmicro60o", "slmicro61o"]
   gpg_keys = [
     for key in fileset("salt/default/gpg_keys/", "*.key"): {
         path = "/etc/gpg_keys/${key}"

backend_modules/libvirt/host/user_data.yaml

@@ -308,10 +308,11 @@ zypper:
 %{ if product_version == "head" }
     - id: container_tools_repo
       name: container_tools_repo
-      baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs" }/Devel:/Galaxy:/Manager:/Head/images/repo/SUSE-Manager-Server-5.0-POOL-x86_64-Media1/
+      baseurl: http://${ use_mirror_images ? mirror : "download.opensuse.org" }/repositories/systemsmanagement:/Uyuni:/Master:/ContainerUtils/SLE-Micro55/
       enabled: 1
       autorefresh: 1
       gpgcheck: false
+#      baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs" }/Devel:/Galaxy:/Manager:/Head/images/repo/SUSE-Multi-Linux-Manager-Server-5.1-x86_64/
 %{ endif }
 %{ if product_version == "5.0-nightly" }
     - id: container_tools_repo
@@ -334,10 +335,11 @@ zypper:
 %{ if product_version == "head" }
     - id: container_tools_repo
       name: container_tools_repo
-      baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs" }/Devel:/Galaxy:/Manager:/Head/images/repo/SUSE-Manager-Proxy-5.0-POOL-x86_64-Media1/
+      baseurl: http://${ use_mirror_images ? mirror : "download.opensuse.org" }/repositories/systemsmanagement:/Uyuni:/Master:/ContainerUtils/SLE-Micro55/
       enabled: 1
       autorefresh: 1
       gpgcheck: false
+#      baseurl: http://${ use_mirror_images ? mirror : "download.suse.de/ibs" }/Devel:/Galaxy:/Manager:/Head/images/repo/SUSE-Multi-Linux-Manager-Proxy-5.1-x86_64/
 %{ endif }
 %{ if product_version == "5.0-nightly" }
     - id: container_tools_repo

modules/proxy_containerized/main.tf

@@ -1,6 +1,6 @@
 variable "images" {
   default = {
-    "head"           = "slemicro55o"
+    "head"           = "slmicro61o"
     "5.0-released"   = "slemicro55o"
     "5.0-nightly"    = "slemicro55o"
     "uyuni-master"   = "leapmicro55o"

modules/server_containerized/main.tf

@@ -2,7 +2,7 @@
 
 variable "images" {
   default = {
-    "head"           = "slemicro55o"
+    "head"           = "slmicro61o"
     "5.0-released"   = "slemicro55o"
     "5.0-nightly"    = "slemicro55o"
     "uyuni-master"   = "leapmicro55o"

salt/repos/additional.sls

@@ -1,5 +1,5 @@
 # Skip Micro OSes, given the additional repos are set up by combustion/ignition/cloud-init.
-{% if (grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro']) %}
+{% if (grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro']) %}
 {% if grains['additional_repos'] %}
 {% for label, url in grains['additional_repos'].items() %}
 {{ label }}_repo:

salt/repos/proxy_containerizedHead.sls

@@ -1,7 +1,7 @@
 {% if 'proxy_containerized' in grains.get('roles') %}
 
 {% if grains.get("os") == 'SUSE' %}
-{% if grains['osfullname'] == 'SLE Micro' %}
+{% if grains['osfullname'] == 'SL-Micro' %}
 
 
 # Commented out because we already add this repo in cloud-init:

salt/repos/server_containerizedHead.sls

@@ -1,7 +1,7 @@
 {% if 'server_containerized' in grains.get('roles')  %}
 
 {% if grains.get("os") == 'SUSE' %}
-{% if grains['osfullname'] == 'SLE Micro' %}
+{% if grains['osfullname'] == 'SL-Micro' %}
 
 
 # Commented out because we already add this repo in cloud-init:

salt/server_containerized/initial_content.sls

@@ -13,7 +13,7 @@ first_user_set_password:
     - name: mgrctl exec 'echo -e "{{ server_password }}\\n{{ server_password }}" | satpasswd -s {{ server_username }}'
     - require:
       - cmd: mgradm_install
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
 {% endif %}

salt/server_containerized/install_k3s.sls

@@ -1,7 +1,7 @@
 include:
   - server_containerized.install_common
 
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
 k3s_install:
   cmd.run:
     - name: curl -sfL https://get.k3s.io | sh -

salt/server_containerized/install_mgradm.sls

@@ -21,7 +21,7 @@ mgradm_install:
     - unless: helm --kubeconfig /etc/rancher/k3s/k3s.yaml list | grep uyuni
 {%- endif %}
     - require:
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
       - sls: server_containerized.install_common

salt/server_containerized/install_podman.sls

@@ -1,7 +1,7 @@
 include:
   - server_containerized.install_common
 
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
 podman_packages:
   pkg.installed:
     - pkgs:

salt/server_containerized/large_deployment.sls

@@ -8,15 +8,15 @@ include:
 large_deployment_increase_tasko_parallel_threads:
   cmd.run:
     - name: mgrctl exec 'echo "taskomatic.com.redhat.rhn.taskomatic.task.MinionActionExecutor.parallel_threads = 3" >> /etc/rhn/rhn.conf'
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
     - require:
       - pkg: uyuni-tools
 {% endif %}
 
 large_deployment_increase_hibernate_max_connections:
   cmd.run:
     - name: mgrctl exec 'echo "hibernate.c3p0.max_size = 100" >> /etc/rhn/rhn.conf'
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
     - require:
       - pkg: uyuni-tools
 {% endif %}
@@ -49,15 +49,15 @@ large_deployment_tomcat_restart:
 large_deployment_increase_database_max_connections:
   cmd.run:
     - name: mgrctl exec 'sed -i "s/max_connections = (.*)/max_connections = 400/" /var/lib/pgsql/data/postgresql.conf'
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
     - require:
       - pkg: uyuni-tools
 {% endif %}
 
 large_deployment_increase_database_work_memory:
   cmd.run:
     - name: mgrctl exec 'sed -i "s/work_mem = (.*)/work_mem = 20MB/" /var/lib/pgsql/data/postgresql.conf'
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
     - require:
       - pkg: uyuni-tools
 {% endif %}

salt/server_containerized/testsuite.sls

@@ -6,7 +6,7 @@ include:
 minima_download:
   cmd.run:
     - name: mgrctl exec 'curl --output-dir /root -OL https://github.com/uyuni-project/minima/releases/download/v0.4/minima-linux-amd64.tar.gz'
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
     - require:
       - pkg: uyuni-tools
 {% endif %}
@@ -60,7 +60,7 @@ test_repo_debian_updates:
     - unless: mgrctl exec "ls -d /srv/www/htdocs/pub/TestRepoDebUpdates"
     - require:
       - cmd: test_repo_debian_updates_script_copy
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
       - cmd: testsuite_packages
@@ -71,7 +71,7 @@ cobbler_configuration:
     - name: "mgrctl exec 'sed -i \"s/redhat_management_permissive: false/redhat_management_permissive: true/\" /etc/cobbler/settings.yaml'"
     - require:
       - sls: server_containerized.install_{{ grains.get('container_runtime') | default('podman', true) }}
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
 
@@ -128,7 +128,7 @@ testsuite_packages:
     - name: mgrctl exec "zypper -n in iputils expect wget OpenIPMI"
     - require:
       - cmd: testsuite_refresh_repos
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
 
@@ -144,7 +144,7 @@ create_pillar_top_sls_to_assign_salt_bundle_config:
   cmd.run:
     - name: mgrctl exec 'echo -e "base:\n  '"'"'*'"'"':\n    - salt_bundle_config" >/srv/pillar/top.sls'
     - require:
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
       - sls: server_containerized.install_{{ grains.get('container_runtime') | default('podman', true) }}
@@ -160,7 +160,7 @@ enable_salt_content_staging_window:
   cmd.run:
     - name: mgrctl exec 'sed '"'"'/java.salt_content_staging_window =/{h;s/= .*/= 0.033/};${x;/^$/{s//java.salt_content_staging_window = 0.033/;H};x}'"'"' -i /etc/rhn/rhn.conf'
     - require:
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
       - sls: server_containerized.install_{{ grains.get('container_runtime') | default('podman', true) }}
@@ -169,7 +169,7 @@ enable_salt_content_staging_advance:
   cmd.run:
     - name: mgrctl exec 'sed '"'"'/java.salt_content_staging_advance =/{h;s/= .*/= 0.05/};${x;/^$/{s//java.salt_content_staging_advance = 0.05/;H};x}'"'"' -i /etc/rhn/rhn.conf'
     - require:
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
       - sls: server_containerized.install_{{ grains.get('container_runtime') | default('podman', true) }}
@@ -178,7 +178,7 @@ enable_kiwi_os_image_building:
   cmd.run:
     - name: mgrctl exec 'sed '"'"'/java.kiwi_os_image_building_enabled =/{h;s/= .*/= true/};${x;/^$/{s//java.kiwi_os_image_building_enabled = true/;H};x}'"'"' -i /etc/rhn/rhn.conf'
     - require:
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}
       - sls: server_containerized.install_{{ grains.get('container_runtime') | default('podman', true) }}
@@ -201,7 +201,7 @@ dump_salt_event_log:
     - name: mgrctl cp /root/salt-events.service server:/usr/lib/systemd/system/salt-events.service
     - require:
       - file: salt_event_service_file
-{% if grains['osfullname'] not in ['SLE Micro', 'openSUSE Leap Micro'] %}
+{% if grains['osfullname'] not in ['SLE Micro', 'SL-Micro', 'openSUSE Leap Micro'] %}
       - pkg: uyuni-tools
 {% endif %}