Fixes #28329 - Handle redis config files paths better

This should allow us to modify them more easily when running on different platforms.
theforeman · Jan 21, 2020 · 61ccc3c · 61ccc3c
1 parent 1f24eb6
commit 61ccc3c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/definitions/features/dynflow_sidekiq.rb b/definitions/features/dynflow_sidekiq.rb
@@ -34,6 +34,6 @@ def service_names
   end
 
   def configured_instances
-    Dir['/etc/foreman/dynflow/*'].map { |config| File.basename(config).gsub(/\.yml$/, '') }
+    Dir['/etc/foreman/dynflow/*'].map { |config| File.basename(config, '.yml') }
   end
 end
diff --git a/definitions/features/redis.rb b/definitions/features/redis.rb
@@ -15,12 +15,15 @@ def services
   end
 
   def config_files
-    ["/etc/opt/rh/#{SCL_NAME}/redis",
-     "/etc/opt/rh/#{SCL_NAME}/redis.conf"]
+    %w(redis redis.conf).map { |config| File.join(etc_prefix, config) }
   end
 
   private
 
+  def etc_prefix
+    "/etc/opt/rh/#{SCL_NAME}"
+  end
+
   def scl_prefix
     "#{SCL_NAME}-"
   end