From 08db4adc0fcaab1be3eb4cdeb0d90efd458e35cf Mon Sep 17 00:00:00 2001 From: Greg Blomquist Date: Wed, 9 Jul 2008 17:30:13 -0400 Subject: Fixed a couple of bugs in genome-bootstrap: * replaced references to "fqdn" with "system-name" in the run method. - Instead of collecting the fqdn, or constructing based on Red Had-specific DNS information, we now only collect enough information for a cobbler system name. * eliminated ability to specify a genome repo by "leaving off the -repo" - Since we cannot assume that any repo (or any machine) will have a "usersys.redhat.com" suffix, the ability to specify a "partial" repo name has been removed. Users are now prompted for the fully qualified domain name of the repo. * selecting first element from installed_systems - With the introduction of "restr_get" that makes sure that all RESTR GET calls return an array (even of only one element), the "get_installed_systems" method needed to change to select the first (and only) element in the installed systems array. Otherwise, "cannot convert Integer to String". --- genome-bootstrap/lib/genome-bootstrap/core.rb | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) (limited to 'genome-bootstrap/lib/genome-bootstrap') diff --git a/genome-bootstrap/lib/genome-bootstrap/core.rb b/genome-bootstrap/lib/genome-bootstrap/core.rb index 4b9ac94..44d70b6 100644 --- a/genome-bootstrap/lib/genome-bootstrap/core.rb +++ b/genome-bootstrap/lib/genome-bootstrap/core.rb @@ -26,8 +26,7 @@ module GenomeBootstrap def initialize(repo) @repo = repo - # Allow users to pass in just the machine-name or the fqdn - @fqdn = @repo.split(".").size > 1 ? @repo : "#{@repo}-repo.usersys.redhat.com" + @fqdn = @repo @genomed = "http://#{@fqdn}/genome" @machine_types_url = @genomed + "/machine_types.html" @@ -117,7 +116,7 @@ module GenomeBootstrap # Retrive information form the /var/log/cobbler/install.log def get_installed_systems - systems = restr_get("#{@genomed}/systems.xml") + systems = restr_get("#{@genomed}/systems.xml")[0] return systems["system"].map do |system| def system.name self["name"].to_s @@ -135,10 +134,10 @@ module GenomeBootstrap end def get_installed_system(system_name) - systems = get_installed_systems - systems.delete_if{|system| - system.name.to_s != system_name.to_s + systems = get_installed_systems.delete_if{|system| + system.name != system_name.to_s } + return systems.empty? ? {} : systems[0] end def cobbler_dns? -- cgit