summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Hicks <mhicks@mhicks-host.usersys.redhat.com>2008-06-18 21:54:33 -0400
committerMatthew Hicks <mhicks@mhicks-host.usersys.redhat.com>2008-06-18 21:54:33 -0400
commit2d35c19bcc2af7ef883528e06ad026c3fbca3702 (patch)
treeaba66e2cf235ba86303186c355e3b146b155d403
parent5ea212d8f77e1014afdc9fde9cd4f2a476d50ae5 (diff)
downloadtools-2d35c19bcc2af7ef883528e06ad026c3fbca3702.tar.gz
tools-2d35c19bcc2af7ef883528e06ad026c3fbca3702.tar.xz
tools-2d35c19bcc2af7ef883528e06ad026c3fbca3702.zip
Fixing up the FQDN for the cloud repo
-rw-r--r--everest-bootstrap/bin/everest-bootstrap10
-rw-r--r--everest-bootstrap/lib/everest-bootstrap/core.rb4
2 files changed, 7 insertions, 7 deletions
diff --git a/everest-bootstrap/bin/everest-bootstrap b/everest-bootstrap/bin/everest-bootstrap
index 3f39eb3..46057f5 100644
--- a/everest-bootstrap/bin/everest-bootstrap
+++ b/everest-bootstrap/bin/everest-bootstrap
@@ -202,8 +202,8 @@ Main {
e.post_config
e.add_system_to_cobbler
- cloud_repo = CloudRepo.new
- cloud_repo.create_machine(@fqdn, @cloud)
+ cloud_repo = CloudRepo.new(@cloud)
+ cloud_repo.create_machine(@fqdn)
end
end
@@ -220,7 +220,7 @@ Main {
argument_required
}
- option('cloud-master', '-l'){
+ option('cloud-master', 'c'){
required
description "Fully qualified domain name for the machine controlling the cloud"
argument_required
@@ -241,8 +241,8 @@ Main {
everest_repo = EverestRepo.new(params['repo'].value)
everest_repo.register_machine(params['fqdn'].value, config)
- cloud_repo = CloudRepo.new
- cloud_repo.create_machine(params['fqdn'].value, params['cloud-master'])
+ cloud_repo = CloudRepo.new(params['repo'].value)
+ cloud_repo.create_machine(params['fqdn'].value, params['cloud-master'].value)
end
end
diff --git a/everest-bootstrap/lib/everest-bootstrap/core.rb b/everest-bootstrap/lib/everest-bootstrap/core.rb
index 6ee545d..07d2e46 100644
--- a/everest-bootstrap/lib/everest-bootstrap/core.rb
+++ b/everest-bootstrap/lib/everest-bootstrap/core.rb
@@ -103,8 +103,8 @@ module EverestBootstrap
super(repo)
end
- def create_machine(machine_fqdn, repo)
- Restr.post("#{@everestd}/koan", :machine_fqdn => machine_fqdn, :repo => repo)
+ def create_machine(machine_fqdn)
+ Restr.post("#{@everestd}/koan", :machine_fqdn => machine_fqdn, :repo => @fqdn)
end
end