Move OPENTOFU_RUNNER_IMAGE to /etc/defaults

agrare · Nov 19, 2024 · 8ac7362 · 8ac7362
1 parent 07ce648
commit 8ac7362
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 4 deletions.
diff --git a/app/models/opentofu_worker.rb b/app/models/opentofu_worker.rb
@@ -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
@@ -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
 

diff --git a/config/settings.yml b/config/settings.yml
@@ -17,6 +17,5 @@
 :workers:
   :worker_base:
     :opentofu_worker:
-      :container_image: docker.io/manageiq/opentofu-runner:latest
       :heartbeat_timeout:
       :opentofu_offline: false
diff --git a/systemd/opentofu-runner.service b/systemd/opentofu-runner.service
@@ -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