added puppet location and organization parameters

theforeman · Dec 30, 2012 · 038125b · 038125b
1 parent cc7c192
commit 038125b
Showing 1 changed file with 6 additions and 0 deletions.
diff --git a/app/models/host.rb b/app/models/host.rb
@@ -355,6 +355,12 @@ def info
     param["puppetmaster"] = puppetmaster
     param["domainname"]   = domain.fullname unless domain.nil? or domain.fullname.nil?
     param["hostgroup"]    = hostgroup.to_label unless hostgroup.nil?
+    if SETTINGS[:locations_enabled]
+      param["location"] = location.name unless location.blank?
+    end
+    if SETTINGS[:organizations_enabled]
+      param["organization"] = organization.name unless organization.blank?
+    end
     if SETTINGS[:unattended]
       param["root_pw"]      = root_pass
       param["puppet_ca"]    = puppet_ca_server if puppetca?