From be99c8bf1292a71a2f6455a7c30c53168c4d36dc Mon Sep 17 00:00:00 2001 From: r Date: Thu, 22 Apr 2021 14:15:17 +0300 Subject: [PATCH] Fix for podman-varlink io.podman.socket': No such file or directory This will vaiabalize the podman socket name and file location so that the podman socket service can start healthy Change-Id: I12284883ad7f73b7aed4a9447cc60f90b8960554 --- tobiko/podman/_client.py | 29 ++++++++++++++++++----------- 1 file changed, 18 insertions(+), 11 deletions(-) diff --git a/tobiko/podman/_client.py b/tobiko/podman/_client.py index e2414e4cc..17dfb6a72 100644 --- a/tobiko/podman/_client.py +++ b/tobiko/podman/_client.py @@ -71,29 +71,36 @@ class PodmanClientFixture(tobiko.SharedFixture): def setup_client(self): # setup podman access via varlink + # W/A for osp16.2 having "podman.socket" instead of "io.podman.socket" podman_client_setup_cmds = \ - "sudo test -f /var/varlink_client_access_setup || \ - (sudo groupadd -f podman && \ + """sudo test -f /var/varlink_client_access_setup || \ + (export podman_service='io.podman.socket' && \ + export podman_service='io.podman.socket' && \ + test -e /lib/systemd/system/io.podman.socket || \ + export podman_service='podman.socket' && \ + test -e /lib/systemd/system/io.podman.socket || \ + export podman_socket_file='/run/podman/podman.sock' && \ + sudo groupadd -f podman && \ sudo usermod -a -G podman heat-admin && \ sudo chmod -R o=wxr /etc/tmpfiles.d && \ sudo echo 'd /run/podman 0770 root heat-admin' > \ /etc/tmpfiles.d/podman.conf && \ - sudo cp /lib/systemd/system/io.podman.socket \ - /etc/systemd/system/io.podman.socket && \ - sudo crudini --set /etc/systemd/system/io.podman.socket Socket \ + sudo cp /lib/systemd/system/$podman_service \ + /etc/systemd/system/$podman_service && \ + sudo crudini --set /etc/systemd/system/$podman_service Socket \ SocketMode 0660 && \ - sudo crudini --set /etc/systemd/system/io.podman.socket Socket \ + sudo crudini --set /etc/systemd/system/$podman_service Socket \ SocketGroup podman && \ sudo systemctl daemon-reload && \ sudo systemd-tmpfiles --create && \ - sudo systemctl enable --now io.podman.socket && \ + sudo systemctl enable --now $podman_service && \ sudo chmod 777 /run/podman && \ sudo chown -R root: /run/podman && \ - sudo chmod g+rw /run/podman/io.podman && \ - sudo chmod 777 /run/podman/io.podman && \ + sudo chmod g+rw $podman_socket_file && \ + sudo chmod 777 $podman_socket_file && \ sudo setenforce 0 && \ - sudo systemctl start io.podman.socket && \ - sudo touch /var/varlink_client_access_setup)" + sudo systemctl start $podman_service && \ + sudo touch /var/varlink_client_access_setup)""" sh.execute(podman_client_setup_cmds, ssh_client=self.ssh_client)