All clouds except for EC2 have a single installation method,
so there is no need for the guesttype parameter. Remove it
from all of the clouds except for EC2.
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
imgfac/builders/Fedora_condorcloud_Builder.py | 4 ++--
imgfac/builders/Fedora_rackspace_Builder.py | 4 ++--
imgfac/builders/Fedora_rhevm_Builder.py | 4 ++--
imgfac/builders/Fedora_vsphere_Builder.py | 4 ++--
imgfac/builders/RHEL5_condorcloud_Builder.py | 2 +-
imgfac/builders/RHEL5_rackspace_Builder.py | 2 +-
imgfac/builders/RHEL5_rhevm_Builder.py | 2 +-
imgfac/builders/RHEL5_vsphere_Builder.py | 2 +-
imgfac/builders/RHEL6_condorcloud_Builder.py | 2 +-
imgfac/builders/RHEL6_rackspace_Builder.py | 2 +-
imgfac/builders/RHEL6_rhevm_Builder.py | 2 +-
imgfac/builders/RHEL6_vsphere_Builder.py | 2 +-
12 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/imgfac/builders/Fedora_condorcloud_Builder.py
b/imgfac/builders/Fedora_condorcloud_Builder.py
index daa59ff..f98170c 100644
--- a/imgfac/builders/Fedora_condorcloud_Builder.py
+++ b/imgfac/builders/Fedora_condorcloud_Builder.py
@@ -43,7 +43,7 @@ class Fedora_condorcloud_Builder(BaseBuilder):
# Oz now uses the tdlobject name property directly in several places so we must
change it
self.tdlobj.name = self.tdlobj.name + "-" + self.new_image_id
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
@@ -60,7 +60,7 @@ class Fedora_condorcloud_Builder(BaseBuilder):
def build_image(self, build_id=None):
try:
- self.init_guest("local")
+ self.init_guest()
self.build_upload(build_id)
except:
self.log_exc()
diff --git a/imgfac/builders/Fedora_rackspace_Builder.py
b/imgfac/builders/Fedora_rackspace_Builder.py
index e90b0e6..9241cf7 100644
--- a/imgfac/builders/Fedora_rackspace_Builder.py
+++ b/imgfac/builders/Fedora_rackspace_Builder.py
@@ -55,7 +55,7 @@ class Fedora_rackspace_Builder(BaseBuilder):
# Oz now uses the tdlobject name property directly in several places so we must
change it
self.tdlobj.name = self.tdlobj.name + "-" + self.new_image_id
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
@@ -96,7 +96,7 @@ class Fedora_rackspace_Builder(BaseBuilder):
def push_image(self, target_image_id, provider, credentials):
try:
- self.init_guest("remote")
+ self.init_guest()
self.push_image_snapshot_rackspace(target_image_id, provider,
credentials)
except:
diff --git a/imgfac/builders/Fedora_rhevm_Builder.py
b/imgfac/builders/Fedora_rhevm_Builder.py
index 9afe4fe..5332e77 100644
--- a/imgfac/builders/Fedora_rhevm_Builder.py
+++ b/imgfac/builders/Fedora_rhevm_Builder.py
@@ -44,7 +44,7 @@ class Fedora_rhevm_Builder(BaseBuilder):
# Oz now uses the tdlobject name property directly in several places so we must
change it
self.tdlobj.name = self.tdlobj.name + "-" + self.new_image_id
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
@@ -61,7 +61,7 @@ class Fedora_rhevm_Builder(BaseBuilder):
def build_image(self, build_id=None):
try:
- self.init_guest("local")
+ self.init_guest()
self.build_upload(build_id)
except:
self.log_exc()
diff --git a/imgfac/builders/Fedora_vsphere_Builder.py
b/imgfac/builders/Fedora_vsphere_Builder.py
index d17163b..95ebfe0 100644
--- a/imgfac/builders/Fedora_vsphere_Builder.py
+++ b/imgfac/builders/Fedora_vsphere_Builder.py
@@ -46,7 +46,7 @@ class Fedora_vsphere_Builder(BaseBuilder):
# Oz now uses the tdlobject name property directly in several places so we must
change it
self.tdlobj.name = self.tdlobj.name + "-" + self.new_image_id
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
@@ -63,7 +63,7 @@ class Fedora_vsphere_Builder(BaseBuilder):
def build_image(self, build_id=None):
try:
- self.init_guest("local")
+ self.init_guest()
self.build_upload(build_id)
except:
self.log_exc()
diff --git a/imgfac/builders/RHEL5_condorcloud_Builder.py
b/imgfac/builders/RHEL5_condorcloud_Builder.py
index 68ce0b5..0cc6470 100644
--- a/imgfac/builders/RHEL5_condorcloud_Builder.py
+++ b/imgfac/builders/RHEL5_condorcloud_Builder.py
@@ -17,7 +17,7 @@ import ConfigParser
from Fedora_condorcloud_Builder import Fedora_condorcloud_Builder
class RHEL5_condorcloud_Builder(Fedora_condorcloud_Builder):
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
diff --git a/imgfac/builders/RHEL5_rackspace_Builder.py
b/imgfac/builders/RHEL5_rackspace_Builder.py
index 441981f..d79bc1a 100644
--- a/imgfac/builders/RHEL5_rackspace_Builder.py
+++ b/imgfac/builders/RHEL5_rackspace_Builder.py
@@ -27,7 +27,7 @@ class RHEL5RemoteGuest(oz.RHEL_5.RHEL5Guest):
pass
class RHEL5_rackspace_Builder(Fedora_rackspace_Builder):
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
diff --git a/imgfac/builders/RHEL5_rhevm_Builder.py
b/imgfac/builders/RHEL5_rhevm_Builder.py
index 2cf4c1b..e663d52 100644
--- a/imgfac/builders/RHEL5_rhevm_Builder.py
+++ b/imgfac/builders/RHEL5_rhevm_Builder.py
@@ -17,7 +17,7 @@ import ConfigParser
from Fedora_rhevm_Builder import Fedora_rhevm_Builder
class RHEL5_rhevm_Builder(Fedora_rhevm_Builder):
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
diff --git a/imgfac/builders/RHEL5_vsphere_Builder.py
b/imgfac/builders/RHEL5_vsphere_Builder.py
index 0bafb77..6eb847f 100644
--- a/imgfac/builders/RHEL5_vsphere_Builder.py
+++ b/imgfac/builders/RHEL5_vsphere_Builder.py
@@ -17,7 +17,7 @@ import ConfigParser
from Fedora_vsphere_Builder import Fedora_vsphere_Builder
class RHEL5_vsphere_Builder(Fedora_vsphere_Builder):
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
diff --git a/imgfac/builders/RHEL6_condorcloud_Builder.py
b/imgfac/builders/RHEL6_condorcloud_Builder.py
index fae57f9..ec09051 100644
--- a/imgfac/builders/RHEL6_condorcloud_Builder.py
+++ b/imgfac/builders/RHEL6_condorcloud_Builder.py
@@ -17,7 +17,7 @@ import ConfigParser
from Fedora_condorcloud_Builder import Fedora_condorcloud_Builder
class RHEL6_condorcloud_Builder(Fedora_condorcloud_Builder):
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
diff --git a/imgfac/builders/RHEL6_rackspace_Builder.py
b/imgfac/builders/RHEL6_rackspace_Builder.py
index da23075..b7f7773 100644
--- a/imgfac/builders/RHEL6_rackspace_Builder.py
+++ b/imgfac/builders/RHEL6_rackspace_Builder.py
@@ -26,7 +26,7 @@ class RHEL6RemoteGuest(oz.RHEL_6.RHEL6Guest):
pass
class RHEL6_rackspace_Builder(Fedora_rackspace_Builder):
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
diff --git a/imgfac/builders/RHEL6_rhevm_Builder.py
b/imgfac/builders/RHEL6_rhevm_Builder.py
index cc3fb14..227e7db 100644
--- a/imgfac/builders/RHEL6_rhevm_Builder.py
+++ b/imgfac/builders/RHEL6_rhevm_Builder.py
@@ -17,7 +17,7 @@ import ConfigParser
from Fedora_rhevm_Builder import Fedora_rhevm_Builder
class RHEL6_rhevm_Builder(Fedora_rhevm_Builder):
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
diff --git a/imgfac/builders/RHEL6_vsphere_Builder.py
b/imgfac/builders/RHEL6_vsphere_Builder.py
index 9f73481..9292043 100644
--- a/imgfac/builders/RHEL6_vsphere_Builder.py
+++ b/imgfac/builders/RHEL6_vsphere_Builder.py
@@ -17,7 +17,7 @@ import ConfigParser
from Fedora_vsphere_Builder import Fedora_vsphere_Builder
class RHEL6_vsphere_Builder(Fedora_vsphere_Builder):
- def init_guest(self, guesttype):
+ def init_guest(self):
# populate a config object to pass to OZ
# This allows us to specify our own output dir but inherit other Oz behavior
# TODO: Messy?
--
1.7.4.4