From bebfe46ffa0b6ff1ef1b70ce8c70ce6a085ffdb6 Mon Sep 17 00:00:00 2001
From: Adrian Riobo <ariobolo@redhat.com>
Date: Wed, 2 Oct 2024 12:05:25 +0200
Subject: [PATCH] fix: delay issues on libvirt service when using RHEL with snc
 profile. Fix #296.

Signed-off-by: Adrian Riobo <ariobolo@redhat.com>
---
 pkg/provider/aws/action/rhel/cloud-config-snc | 24 ++++++++++---------
 tkn/infra-aws-rhel.yaml                       |  3 ++-
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/pkg/provider/aws/action/rhel/cloud-config-snc b/pkg/provider/aws/action/rhel/cloud-config-snc
index 6dcc22d94..1a9ae16dc 100644
--- a/pkg/provider/aws/action/rhel/cloud-config-snc
+++ b/pkg/provider/aws/action/rhel/cloud-config-snc
@@ -5,26 +5,28 @@ rh_subscription:
   auto-attach: true
 runcmd:
   - while fuser /var/lib/rpm/.rpm.lock > /dev/null 2>&1 ; do sleep 1 ; done
-  - dnf install -y podman qemu-kvm libvirt virt-install virt-viewer jq git
+  - dnf clean all
+  - dnf --best install -y qemu-kvm libvirt virt-install virt-viewer jq git curl openssl
   # Debug libvirt
   #- echo 'log_filters="1:libvirt 1:util 1:qemu"' | tee -a /etc/libvirt/libvirtd.conf
   #- echo 'log_outputs="1:file:/var/log/libvirt/libvirtd.log"' | tee -a /etc/libvirt/libvirtd.conf
   # https://libvirt.org/manpages/libvirtd.html#system-socket-activation
   - echo 'LIBVIRTD_ARGS="--listen"' | tee -a /etc/sysconfig/libvirtd
-  - echo 'listen_tls = 0' | tee -a /etc/libvirt/libvirtd.conf
-  - echo 'listen_tcp = 1' | tee -a /etc/libvirt/libvirtd.conf
-  - echo 'tcp_port = "16509"' | tee -a /etc/libvirt/libvirtd.conf
-  - echo 'auth_tcp = "none"' | tee -a /etc/libvirt/libvirtd.conf
+  # - echo 'listen_tls = 0' | tee -a /etc/libvirt/libvirtd.conf
+  # - echo 'listen_tcp = 1' | tee -a /etc/libvirt/libvirtd.conf
+  # - echo 'tcp_port = "16509"' | tee -a /etc/libvirt/libvirtd.conf
+  # - echo 'auth_tcp = "none"' | tee -a /etc/libvirt/libvirtd.conf
   - systemctl daemon-reload 
-  - systemctl enable libvirtd-tcp.socket 
-  - systemctl start --no-block libvirtd-tcp.socket 
-  - systemctl mask libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket
-  - systemctl enable libvirtd 
-  - systemctl start --no-block libvirtd  
+  # - systemctl enable libvirtd-tcp.socket 
+  # - systemctl start --no-block libvirtd-tcp.socket 
+  # - systemctl mask libvirtd.socket libvirtd-ro.socket libvirtd-admin.socket libvirtd-tls.socket libvirtd-tcp.socket
+  # - systemctl enable libvirtd 
+  # - systemctl start --no-block libvirtd  
+  - for drv in qemu network nodedev nwfilter secret storage interface; do systemctl start virt${drv}d{,-ro,-admin}.socket; done
   - usermod -a -G libvirt {{ .Username }}
   - echo "user.max_user_namespaces=28633" | tee -a /etc/sysctl.d/userns.conf
   - sysctl -p /etc/sysctl.d/userns.conf
-  - dnf upgrade -y curl openssl
+  # - dnf upgrade -y curl openssl
 {{ if .InstallActionsRunner }}  - sudo -u {{ .Username }} bash -c /opt/install-ghrunner.sh {{ end }}
 {{ if .InstallActionsRunner }}write_files:
   # Github actions runner installation
diff --git a/tkn/infra-aws-rhel.yaml b/tkn/infra-aws-rhel.yaml
index 94b4174d7..8199cdf38 100644
--- a/tkn/infra-aws-rhel.yaml
+++ b/tkn/infra-aws-rhel.yaml
@@ -90,7 +90,8 @@ spec:
 
   steps:
   - name: provisioner
-    image: quay.io/redhat-developer/mapt:v0.7.0-dev
+    # image: quay.io/redhat-developer/mapt:v0.7.0-dev
+    image: quay.io/rhqp/mapt:pr-297
     imagePullPolicy: Always
     script: |
       #!/bin/sh