Closed agrare closed 3 months ago
@agrare A conflict occurred during the backport of this pull request to radjabov
.
If this pull request is based on another pull request that has not been marked for backport, add the appropriate labels to the other pull request. Otherwise, please create a new pull request direct to the radjabov
branch in order to resolve this.
Conflict details:
diff --cc systemd/opentofu-runner.service
index 296da24,9f5460f..0000000
--- a/systemd/opentofu-runner.service
+++ b/systemd/opentofu-runner.service
@@@ -6,7 -6,7 +6,11 @@@ WantedBy=opentofu-runner.targe
User=manageiq
Group=manageiq
ExecStartPre=/bin/rm -f /tmp/%n.cid
++<<<<<<< HEAD
+ExecStart=/usr/bin/podman run --conmon-pidfile %T/%N.pid --cidfile %T/%N.cid --cgroup-manager=cgroupfs --cgroups=no-conmon --log-driver=journald --replace --name=opentofu-runner --secret=opentofu-runner-secret --root=/var/www/miq/vmdb/data/containers/storage --env=DATABASE_HOSTNAME=${DATABASE_HOSTNAME} --env=DATABASE_NAME=${DATABASE_NAME} --env=DATABASE_USERNAME=${DATABASE_USERNAME} --env=MEMCACHE_SERVERS=${MEMCACHE_SERVERS} --expose=6000 $OPENTOFU_RUNNER_IMAGE
++=======
+ ExecStart=/usr/bin/podman run --conmon-pidfile %T/%N.pid --cidfile %T/%N.cid --cgroup-manager=cgroupfs --cgroups=no-conmon --log-driver=journald --replace --name=opentofu-runner --secret=opentofu-runner-secret --root=/var/www/miq/vmdb/data/containers/storage --env=DATABASE_HOSTNAME=${DATABASE_HOSTNAME} --env=DATABASE_NAME=${DATABASE_NAME} --env=DATABASE_USERNAME=${DATABASE_USERNAME} --env=MEMCACHE_SERVERS=${MEMCACHE_SERVERS} --volume=/var/lib/manageiq/opentofu-runner/certs:/opt/app-root/src/config/cert:z --expose=6000 --net=host $OPENTOFU_RUNNER_IMAGE
++>>>>>>> d1302dd (Merge pull request #40 from agrare/fix_opentofu_runner_postgresql_connection_refused)
ExecStop=/usr/bin/podman stop --ignore -t 30 --cidfile %T/%N.cid --cgroup-manager=cgroupfs --root=/var/www/miq/vmdb/data/containers/storage
ExecStopPost=/usr/bin/podman rm --ignore --cidfile %T/%N.cid --cgroup-manager=cgroupfs --root=/var/www/miq/vmdb/data/containers/storage
ExecStopPost=/usr/bin/rm -f %T/%N.pid %T/%N.cid
Backported to radjabov
in commit 10dfc1967de58f42d7e8cdbdd57afbabe3b13c19.
commit 10dfc1967de58f42d7e8cdbdd57afbabe3b13c19
Author: Brandon Dunne <brandondunne@hotmail.com>
Date: Tue May 28 12:12:16 2024 -0400
Merge pull request #40 from agrare/fix_opentofu_runner_postgresql_connection_refused
Fix opentofu-runner postgresql connection refused
(cherry picked from commit d1302dd05144d8d681b4852b609bf478a502ba39)
NOTE
--net=host
is just a placeholder, but even using eth0's addr or host.containers.local I'm not able to connect to postgres from within the podFrom within the running pod: