summaryrefslogtreecommitdiffstats
path: root/genome-bootstrap/lib
diff options
context:
space:
mode:
Diffstat (limited to 'genome-bootstrap/lib')
-rw-r--r--genome-bootstrap/lib/genome-bootstrap/core.rb11
1 files changed, 5 insertions, 6 deletions
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?