Skip to content

[WIP] Move OPENTOFU_RUNNER_IMAGE to /etc/defaults #87

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
agrare wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Move OPENTOFU_RUNNER_IMAGE to /etc/defaults #87

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions app/models/opentofu_worker.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ def container_image_name
end

def container_image
ENV["OPENTOFU_RUNNER_IMAGE"] || worker_settings[:container_image] || default_image
ENV["OPENTOFU_RUNNER_IMAGE"] || default_image
end

def enable_systemd_unit
Expand All @@ -91,8 +91,7 @@ def systemd_environment_variables
"DATABASE_HOSTNAME" => database_configuration[:host],
"DATABASE_NAME" => database_configuration[:database],
"DATABASE_USERNAME" => database_configuration[:username],
"MEMCACHE_SERVERS" => ::Settings.session.memcache_server,
"OPENTOFU_RUNNER_IMAGE" => container_image
"MEMCACHE_SERVERS" => ::Settings.session.memcache_server
}
end

Expand Down
1 change: 0 additions & 1 deletion config/settings.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,5 @@
:workers:
:worker_base:
:opentofu_worker:
:container_image: docker.io/manageiq/opentofu-runner:latest
:heartbeat_timeout:
:opentofu_offline: false
1 change: 1 addition & 0 deletions systemd/opentofu-runner.service
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ User=manageiq
Group=manageiq
Slice=manageiq.slice
Environment=PODMAN_SYSTEMD_UNIT=%n
EnvironmentFile=/etc/default/manageiq-container-images.properties
KillMode=mixed
Delegate=yes
Type=notify
Expand Down