Skip to content

Commit 8ac7362

Browse files
committed
Move OPENTOFU_RUNNER_IMAGE to /etc/defaults
1 parent 07ce648 commit 8ac7362

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

app/models/opentofu_worker.rb

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def container_image_name
6969
end
7070

7171
def container_image
72-
ENV["OPENTOFU_RUNNER_IMAGE"] || worker_settings[:container_image] || default_image
72+
ENV["OPENTOFU_RUNNER_IMAGE"] || default_image
7373
end
7474

7575
def enable_systemd_unit
@@ -91,8 +91,7 @@ def systemd_environment_variables
9191
"DATABASE_HOSTNAME" => database_configuration[:host],
9292
"DATABASE_NAME" => database_configuration[:database],
9393
"DATABASE_USERNAME" => database_configuration[:username],
94-
"MEMCACHE_SERVERS" => ::Settings.session.memcache_server,
95-
"OPENTOFU_RUNNER_IMAGE" => container_image
94+
"MEMCACHE_SERVERS" => ::Settings.session.memcache_server
9695
}
9796
end
9897

config/settings.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,5 @@
1717
:workers:
1818
:worker_base:
1919
:opentofu_worker:
20-
:container_image: docker.io/manageiq/opentofu-runner:latest
2120
:heartbeat_timeout:
2221
:opentofu_offline: false

systemd/opentofu-runner.service

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ User=manageiq
1313
Group=manageiq
1414
Slice=manageiq.slice
1515
Environment=PODMAN_SYSTEMD_UNIT=%n
16+
EnvironmentFile=/etc/default/manageiq-container-images.properties
1617
KillMode=mixed
1718
Delegate=yes
1819
Type=notify

0 commit comments

Comments
 (0)