diff --git a/containers/server-image/Dockerfile b/containers/server-image/Dockerfile index 97548fd112a..2ad0ac83dd3 100644 --- a/containers/server-image/Dockerfile +++ b/containers/server-image/Dockerfile @@ -17,6 +17,9 @@ RUN chmod a+x /usr/bin/healthcheck.sh # Copy timezone link update service COPY timezone_alignment.service /usr/lib/systemd/system/ +# Copy Salt Event Publisher service used by Saline +COPY salt-event-publisher.service /usr/lib/systemd/system/ + COPY remove_unused.sh . RUN echo "rpm.install.excludedocs = yes" >>/etc/zypp/zypp.conf @@ -69,7 +72,8 @@ RUN zypper --gpg-auto-import-keys --non-interactive install --auto-agree-with-li sssd-ad \ sssd-ipa \ sssd-krb5 \ - sssd-tools + sssd-tools \ + socat RUN sed -i 's/sysctl kernel.shmmax/#sysctl kernel.shmmax/g' /usr/bin/uyuni-setup-reportdb @@ -104,7 +108,8 @@ RUN echo "cat /etc/motd" >/etc/sh.shrc.local RUN systemctl enable prometheus-node_exporter; \ systemctl enable uyuni-setup; \ systemctl enable timezone_alignment; \ - systemctl enable sssd; + systemctl enable sssd; \ + systemctl enable salt-event-publisher; # Provide tool to synchronize package and configuration files to persistent volumes COPY uyuni-configfiles-sync /usr/bin diff --git a/containers/server-image/salt-event-publisher.service b/containers/server-image/salt-event-publisher.service new file mode 100644 index 00000000000..3fca4b63096 --- /dev/null +++ b/containers/server-image/salt-event-publisher.service @@ -0,0 +1,19 @@ +[Unit] +Description=Salt Event Publisher +After=network.target salt-master.service +Requires=salt-master.service + +[Service] +Type=simple +User=salt +StandardOutput=syslog +StandardError=syslog +SyslogIdentifier=salt-event-publisher +ExecStartPre=/bin/bash -c 'until [ -S /run/salt/master/master_event_pub.ipc ]; do sleep 1; done' +ExecStart=/usr/bin/socat TCP4-LISTEN:4512,reuseaddr,fork UNIX-CONNECT:/run/salt/master/master_event_pub.ipc +Restart=always +SuccessExitStatus=0 143 +RestartForceExitStatus=143 + +[Install] +WantedBy=multi-user.target diff --git a/containers/server-image/server-image.changes.vzhestkov.expose-salt-event-publisher b/containers/server-image/server-image.changes.vzhestkov.expose-salt-event-publisher new file mode 100644 index 00000000000..19464458afd --- /dev/null +++ b/containers/server-image/server-image.changes.vzhestkov.expose-salt-event-publisher @@ -0,0 +1 @@ +- Expose salt event bus with salt-event-publisher.service