Merge pull request #7 from witlessbird/pulp-settings

runcible uses pulp url from settings now
theforeman · Jul 24, 2013 · 175031a · 175031a
2 parents 8957ddf + dedc6f0
commit 175031a
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/app/models/content/orchestration/pulp.rb b/app/models/content/orchestration/pulp.rb
@@ -100,9 +100,10 @@ def pulp_distributor
   end
 
   def runcible_config
+    pulp_url = URI(Setting['pulp_url'])
     {
-      :url          => "https://amos-dev.sat.lab.tlv.redhat.com",
-      :api_path     => "/pulp/api/v2/",
+      :url          => "#{pulp_url.scheme}://#{pulp_url.host}:#{pulp_url.port}",
+      :api_path     => pulp_url.path,
       :user         => "admin",
       :timeout      => 60,
       :open_timeout => 60,

diff --git a/app/models/setting/content.rb b/app/models/setting/content.rb
@@ -9,12 +9,12 @@ def self.load_defaults
     Setting.transaction do
       [
         self.set('use_pulp', "Use Pulp to manage content", true),
-        self.set('pulp_url', "Pulp URL", "127.0.0.1:5672")
+        self.set('pulp_url', "Pulp URL", "https://127.0.0.1/pulp/api/v2/")
       ].compact.each { |s| self.create s.update(:category => "Setting::Content")}
     end
 
     true
 
   end
 
-end
+end