Changes to genome-bootstrap:

* https://engineering.redhat.com/trac/IT_Architecture/ticket/209
  - genome-bootstrap now filters out any cobbler profiles with "__Appliance"
    in the name during default mode.  This will reduce confusion when
    users are selecting the cobbler profile.

NOTE!: The cobbler profiles have been updated on oss1-repo.usersys.redhat.com
but if there are any cobbler profiles in a git repo that get laid down with
a new GenomeAppliance machine, these will have to be updated too.  Here's how
the profiles were updated:
GenomeCloud* -> Cloud__Appliance*
GenomeRepo* -> Genome__Appliance*
GenomeRepoGuest* -> GenomeGuest__Appliance*

* https://engineering.redhat.com/trac/IT_Architecture/ticket/210
  - The machine_types.rb file on oss1-repo.usersys.redhat.com was updated
    to no longer ask for the "repoappliance" fact value.  Now,
    genome-bootstrap's default mode assigns the "repoappliance" parameter
    the value of the genome repo.

* https://engineering.redhat.com/trac/IT_Architecture/ticket/211
  - genome-bootstrap no longer asks for "additional facts" in the default
    mode.  The assumption is that if you want to provide additional facts
    you would use the advanced mode.

1 files changed, 9 insertions, 4 deletions

diff --git a/genome-bootstrap/lib/genome-bootstrap/core.rb b/genome-bootstrap/lib/genome-bootstrap/core.rb
index 6a5c6c6..44616b8 100644
--- a/genome-bootstrap/lib/genome-bootstrap/core.rb
+++ b/genome-bootstrap/lib/genome-bootstrap/core.rb
@@ -41,10 +41,10 @@ module GenomeBootstrap
       @machines ||= fetch_data
     end
 
-    def facts_for(type, machine_name)
+    def facts_for(type)
       # Don't want to pull in the genome lib.  See below fore more detail.
       facts = restr_get("#{@genomed}/machine_types/#{type}.xml", "fact")
-      return facts.map do |f|
+      return (!facts or facts.empty?) ? {} : facts.map do |f|
         def f.name
           self["name"]
         end
@@ -55,16 +55,21 @@ module GenomeBootstrap
 
         # Here's where we make use of the DSL's simple templating
         f.instance_variable_set(:@repo, @repo)
-        f.instance_variable_set(:@machine_name, machine_name)
         def f.default
           # handle there case where there is no default
-          self["default"].gsub("%repo%", @repo).gsub("%machine_name%", @machine_name) rescue ""
+          self["default"].gsub("%repo%", @repo) rescue ""
         end
         
         f
       end
     end
 
+    def bootstrapping_cobbler_profiles
+      @cobbler_profiles.delete_if{|profile|
+        profile.include?("__Appliance")
+      }
+    end
+
     def classes_for(type)
       restr_get("#{@genomed}/machine_types/#{type}.xml", "class")
     end