foreman_templates 3.0.0 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ab073792fefeb26fbe23885b712a9baa467753f0
-  data.tar.gz: c9b1d817144bd1fb43b7667a9e453000a4e047e0
+  metadata.gz: 82ee874e71d9e9079295163e6047be8d000ec0da
+  data.tar.gz: dced21a45bdb893b228b1ac6656eecfaa38bee92
 SHA512:
-  metadata.gz: 8d746a74ce4346d98e062cd6df27c163d411474925d52ee6e54594fc68f16ccf9776fb849a701c0ef137e8136c8faf2d1ff6d915e39e8214e7dea3c004bea478
-  data.tar.gz: 7ee0097bbc39da25acd264c7932db97c789edc1e8e042ffd7af0f984ebbe20ba7dd1cab8281390bc9022b729e1c6686ef73d81be835bb1abfb8a6035a6986223
+  metadata.gz: 4177cb40d2c6dfa46b6ce5435320b7b84d4d870846a59c82b48824a46d16466b92b16c38a7304cbf7ed48efc74fc421425bbaf99211e8751f2f737fdcb4c93f2
+  data.tar.gz: 6e06c16092fe06fd6913575e3dbf618658a4ea1c1723187ac57ce680a785b4407ce181235b4bdd15e3e322b848e28f753c196baf8f05a4d18702cd8ab86d7397

data/app/models/concerns/foreman_templates/provisioning_template_import.rb

@@ -17,7 +17,9 @@ module ForemanTemplates::ProvisioningTemplateImport
         :snippet          => false,
         :template_kind_id => kind.id
       }
-      oses = map_oses(metadata)
+      oses          = map_metadata(metadata, 'oses')
+      locations     = map_metadata(metadata, 'locations')
+      organizations = map_metadata(metadata, 'organizations')
 
       # Printout helpers
       c_or_u = template.new_record? ? 'Created' : 'Updated'
@@ -25,6 +27,8 @@ module ForemanTemplates::ProvisioningTemplateImport
 
       if (metadata['associate'] == 'new' && template.new_record?) || (metadata['associate'] == 'always')
         data[:operatingsystem_ids] = oses.map(&:id)
+        data[:location_ids]        = locations.map(&:id)
+        data[:organization_ids]    = organizations.map(&:id)
       end
 
       if data[:template] != template.template
@@ -36,11 +40,15 @@ module ForemanTemplates::ProvisioningTemplateImport
         status  = template.update_attributes(data)
         result  = "  #{c_or_u} Template #{id_string}:#{name}"
         result += "\n    Operatingsystem Associations:\n    - #{oses.map(&:fullname).join("\n    - ")}" unless oses.empty?
-      elsif data[:operatingsystem_ids]
+        result += "\n    Organizations Associations:\n    - #{organizations.map(&:name).join("\n    - ")}" unless organizations.empty?
+        result += "\n    Location Associations:\n    - #{locations.map(&:name).join("\n    - ")}" unless locations.empty?
+      elsif data[:operatingsystem_ids] || data[:location_ids] || data[:organization_ids]
         diff    = nil
         status  = template.update_attributes(data)
         result  = "  #{c_or_u} Template Associations #{id_string}:#{name}"
         result += "\n    Operatingsystem Associations:\n    - #{oses.map(&:fullname).join("\n    - ")}" unless oses.empty?
+        result += "\n    Organizations Associations:\n    - #{organizations.map(&:name).join("\n    - ")}" unless organizations.empty?
+        result += "\n    Location Associations:\n    - #{locations.map(&:name).join("\n    - ")}" unless locations.empty?
       else
         diff    = nil
         status  = true
@@ -48,15 +56,5 @@ module ForemanTemplates::ProvisioningTemplateImport
       end
       { :diff => diff, :status => status, :result => result }
     end
-
-    def map_oses(metadata)
-      if metadata['oses']
-        metadata['oses'].map do |os|
-          Operatingsystem.all.map { |db| db.to_label =~ /^#{os}/ ? db : nil }
-        end.flatten.compact
-      else
-        []
-      end
-    end
   end
 end

data/app/models/concerns/foreman_templates/ptable_import.rb

@@ -8,15 +8,21 @@ module ForemanTemplates::PtableImport
 
       # Data
       ptable = Ptable.where(:name => name).first_or_initialize
-      data = { :layout => text }
-      oses = map_oses(metadata)
+      data = {
+        :layout => text
+      }
+      oses          = map_metadata(metadata, 'oses')
+      locations     = map_metadata(metadata, 'locations')
+      organizations = map_metadata(metadata, 'organizations')
 
       # Printout helpers
       c_or_u = ptable.new_record? ? 'Created' : 'Updated'
       id_string = ('id' + ptable.id) rescue ''
 
       if (metadata['associate'] == 'new' && ptable.new_record?) || (metadata['associate'] == 'always')
-        data[:os_family] = oses.map(&:family).uniq.first
+        data[:os_family]        = oses.map(&:family).uniq.first
+        data[:location_ids]     = locations.map(&:id)
+        data[:organization_ids] = organizations.map(&:id)
       end
 
       if data[:layout] != ptable.layout
@@ -27,11 +33,16 @@ module ForemanTemplates::PtableImport
         ).to_s(:color)
         status  = ptable.update_attributes(data)
         result  = "  #{c_or_u} Ptable #{id_string}:#{name}"
-      elsif data[:os_family]
+        result += "\n    Operatingsystem Family:\n    - #{oses.map(&:family).uniq.first}" unless oses.empty?
+        result += "\n    Organizations Associations:\n    - #{organizations.map(&:name).join("\n    - ")}" unless organizations.empty?
+        result += "\n    Location Associations:\n    - #{locations.map(&:name).join("\n    - ")}" unless locations.empty?
+      elsif data[:os_family] || data[:location_ids] || data[:organization_ids]
         diff    = nil
         status  = ptable.update_attributes(data)
         result  = "  #{c_or_u} Ptable Associations #{id_string}:#{name}"
         result += "\n    Operatingsystem Family:\n    - #{oses.map(&:family).uniq.first}" unless oses.empty?
+        result += "\n    Organizations Associations:\n    - #{organizations.map(&:name).join("\n    - ")}" unless organizations.empty?
+        result += "\n    Location Associations:\n    - #{locations.map(&:name).join("\n    - ")}" unless locations.empty?
       else
         diff    = nil
         status  = true
@@ -39,16 +50,5 @@ module ForemanTemplates::PtableImport
       end
       { :diff => diff, :status => status, :result => result }
     end
-
-    # TODO: DRY this, it's copied from ProvisioningTemplateImport
-    def map_oses(metadata)
-      if metadata['oses']
-        metadata['oses'].map do |os|
-          Operatingsystem.all.map { |db| db.to_label =~ /^#{os}/ ? db : nil }
-        end.flatten.compact
-      else
-        []
-      end
-    end
   end
 end

data/app/models/concerns/foreman_templates/template_import.rb

@@ -29,5 +29,26 @@ module ForemanTemplates::TemplateImport
       end
       { :diff => diff, :status => status, :result => result }
     end
+
+    def map_metadata(metadata, param)
+      if metadata[param]
+        case param
+        when 'oses'
+          metadata[param].map do |os|
+            Operatingsystem.all.map { |db| db.to_label =~ /^#{os}/ ? db : nil }
+          end.flatten.compact
+        when 'locations'
+          metadata[param].map do |loc|
+            Location.all.map { |db| db.name =~ /^#{loc}/ ? db : nil }
+          end.flatten.compact
+        when 'organizations'
+          metadata[param].map do |org|
+            Organization.all.map { |db| db.name =~ /^#{org}/ ? db : nil }
+          end.flatten.compact
+        end
+      else
+        []
+      end
+    end
   end
 end

data/lib/foreman_templates/version.rb

@@ -1,3 +1,3 @@
 module ForemanTemplates
-  VERSION = '3.0.0'.freeze
+  VERSION = '3.1.0'.freeze
 end

data/lib/tasks/foreman_templates_tasks.rake

@@ -9,7 +9,7 @@ namespace :templates do
     #* prefix    => The string all imported templates should begin with [Community ]
     #* dirname   => The directory within the git tree containing the templates [/]
     #* filter    => Import names matching this regex (case-insensitive; snippets are not filtered)
-    #* associate => Associate to OS, always, new or never  [new]
+    #* associate => Associate to OS's, Locations & Organizations. Options are: always, new or never  [new]
 
     results = ForemanTemplates::TemplateImporter.new({
       verbose:   ENV['verbose'],

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_templates
 version: !ruby/object:Gem::Version
-  version: 3.0.0
+  version: 3.1.0
 platform: ruby
 authors:
 - Greg Sutcliffe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-07 00:00:00.000000000 Z
+date: 2016-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: diffy