Fixes #16563 - Enables syncing atomic content from cdn

Fixes include 1) Code to handle empty substitutions when enabling an atomic kickstart 2) Code to handle creation of the Red Hat Atomic host 3) Removed the Unnecessary seed script to create AH
Katello · Sep 20, 2016 · f17fdad · f17fdad
1 parent a2ed5e0
commit f17fdad
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 20 deletions.
diff --git a/app/controllers/katello/products_controller.rb b/app/controllers/katello/products_controller.rb
@@ -72,7 +72,7 @@ def exclude_rolling_kickstart_repos(repos)
       repos.select do |repo|
         if repo[:path].include?('kickstart')
           variants = ['Server', 'Client', 'ComputeNode', 'Workstation']
-          has_variant = variants.any? { |v| repo[:substitutions][:releasever].include?(v) }
+          has_variant = variants.any? { |v| repo[:substitutions][:releasever].try(:include?, v) }
           has_variant ? repo[:enabled] : true
         else
           true

diff --git a/app/models/katello/concerns/redhat_extensions.rb b/app/models/katello/concerns/redhat_extensions.rb
@@ -35,7 +35,9 @@ def create_operating_system(name, major, minor)
         end
 
         def construct_name(family)
-          if family.include? 'Red Hat'
+          if family == ::Operatingsystem::REDHAT_ATOMIC_HOST_DISTRO_NAME
+            return ::Operatingsystem::REDHAT_ATOMIC_HOST_OS
+          elsif family.include? 'Red Hat'
             return 'RedHat'
           else
             return family.tr(' ', '_')

diff --git a/db/seeds.d/109-atomic_os.rb b/db/seeds.d/109-atomic_os.rb
diff --git a/test/lib/tasks/seeds_test.rb b/test/lib/tasks/seeds_test.rb
@@ -85,11 +85,4 @@ class EnsureSyncNotificationsTest < SeedsTest
       seed
     end
   end
-
-  class AtomicOsTest < SeedsTest
-    test "Make sure atomic OS got setup" do
-      seed
-      assert Operatingsystem.find_by(:name => Operatingsystem::REDHAT_ATOMIC_HOST_OS).present?
-    end
-  end
 end