Merge lp:~nuclearbob/utah/config-changes into lp:utah

[Max Brustkern]

This branch implements several changes to the config interface.

Config directories are now supported, and all files within those (with size > 0) will be processed as json files. If a file that is a file (according to os.path.isfile) and has size > 0 doesn't parse as JSON, an exception will be raised with the filename. Files/directories are processed in this order:
/etc/utah/config
/etc/utah/conf.d
~/.utah/config
~/.utah/conf.d
$UTAH_CONFIF_FILE
$UTAH_CONFIF_DIR
Currently, files that are actually directories will be processed correctly, and vice versa. I'm not sure if we should support that or not.

Additionally, most options available via the command line interface can now be supplied via the config file. These include:
machinetype
emulator
image
kernel
initrd
preseed
boot
xml
gigabytes (supported as disksizes, which should be a list)
series
type
arch
debug (by setting the default log level or the debug log file)
diskbus
Currently unsupported options are:
variant (nothing actually uses this yet)
no-destroy (we've talked about reworking this anyway, so I'd rather support it then)
json (this will be changed or removed soon anyway, and didn't affect the actual provisioner, just the test runner)
name (not all provisioning types currently support this, so I'd prefer to add this support later)

One current caveat is that the "which provisioning method do I run?" stuff hasn't been updated to detect whether preseed, image, etc. was passed in a config file and hand off to CustomVM instead of VMToolsVM appropriately. If that's important immediately, I can add it now, otherwise, I'm already working on the "automatically download an image and install it using CustomVM" branch, at which point CustomVM would be the default for all VM installations. Since vm-tools is probably not going to be maintained now that uvt exists, I think depracating the VMTools provisioner would be wise once we have auto-downloading in place. If we want to add a new one for uvt, we can do that.

[Joe Talbott (joetalbott)]

Looks good to me.

One nit; I'd put the release choices into a module level variable somewhere so you only have to make the change in one place.

in common.py

SERIES_CHOICES = ['hardy', 'lucid', ..., 'raring']

and in the other places

from common import SERIES_CHOICES
...
parser.add_argument(..., choices=SERIES_CHOICES...

and

vm_release_list = " ".join(SERIES_CHOICES)

review: Approve

[Javier Collado (javier.collado)]

It would be really nice to have some documentation in config.py for each configuration variable.
Looking at them, isn't really obvious what they're supposed to be used for.

I also agree with Joe's comment. However, since uqt-vm-tools.conf isn't a python file, we can still keep that as it is for now. Adding a comment wherever SERIES_CHOICES is defined to remind us to keep vm_release_list in sync would be nice to have though.

[lp:~nuclearbob/utah/config-changes]

752. By Max Brustkern on 2012-11-08

Implemented serieschoices and cleaned up long lines

753. By Max Brustkern on 2012-11-08

Changed default install type to mini to save download time/disk space

754. By Max Brustkern on 2012-11-08

Added comments

[Max Brustkern (nuclearbob)]

I pushed a new branch that should address those, and also change the default install type to mini to save download time and disk space for people who don't care what type of install they're using.

As far as vm_release_list is concerned, I'd like to deprecate the vmtools integration soon. I'm testing the automatic iso downloading stuff now, and I'll propose a merge once it all looks good, probably later today.

review: Needs Resubmitting

[Joe Talbott (joetalbott)]

Looks good to me. Merge away.

review: Approve

=== modified file 'conf/utah/uqt-vm-tools.conf'
--- conf/utah/uqt-vm-tools.conf	2012-07-11 17:43:36 +0000
+++ conf/utah/uqt-vm-tools.conf	2012-11-08 15:07:21 +0000
@@ -1,5 +1,5 @@
 # list of all active releases (included devel)
-vm_release_list="hardy lucid natty oneiric precise quantal"
+vm_release_list="hardy lucid oneiric precise quantal raring"
 
 # used by vm-repo (ie 'umt repo' puts stuff in /var/www/debs/testing/..., so
 # vm_repo_url should be the URL to those files. The IP of the host is by

=== modified file 'examples/run_install_test.py'
--- examples/run_install_test.py	2012-10-19 21:57:01 +0000
+++ examples/run_install_test.py	2012-11-08 15:07:21 +0000
@@ -3,6 +3,7 @@
 import argparse
 import sys
 
+from utah import config
 from utah.exceptions import UTAHException
 from utah.url import url_argument
 from utah.group import check_user_group, print_group_error_message
@@ -46,8 +47,7 @@
                         help=('Size in gigabytes of virtual disk, '
                               'specify more than once for multiple disks'))
     parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=('hardy', 'lucid', 'natty',
-                                 'oneiric', 'precise', 'quantal'),
+                        choices=config.serieschoices,
                         help='Series to use for installation (%(choices)s)')
     parser.add_argument('-t', '--type', metavar='TYPE',
                         choices=('desktop', 'server', 'mini', 'alternate'),

=== modified file 'examples/run_test_bamboo_feeder.py'
--- examples/run_test_bamboo_feeder.py	2012-10-19 13:02:44 +0000
+++ examples/run_test_bamboo_feeder.py	2012-11-08 15:07:21 +0000
@@ -26,8 +26,7 @@
     parser.add_argument('runlists', metavar='runlist', nargs='+',
                         help='URLs of runlist files to run')
     parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=('hardy', 'lucid', 'natty',
-                                 'oneiric', 'precise', 'quantal'),
+                        choices=config.serieschoices,
                         help='Series to use for VM creation (%(choices)s)')
     parser.add_argument('-t', '--type', metavar='TYPE',
                         choices=('desktop', 'server', 'mini', 'alternate'),

=== modified file 'examples/run_test_cobbler.py'
--- examples/run_test_cobbler.py	2012-10-31 11:27:40 +0000
+++ examples/run_test_cobbler.py	2012-11-08 15:07:21 +0000
@@ -29,8 +29,7 @@
     parser.add_argument('-p', '--preseed', type=url_argument,
                         help='Preseed file to use for installation')
     parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=('hardy', 'lucid', 'natty',
-                                 'oneiric', 'precise', 'quantal'),
+                        choices=config.serieschoices,
                         help='Series to use for VM creation (%(choices)s)')
     parser.add_argument('-t', '--type', metavar='TYPE',
                         choices=('desktop', 'server', 'mini', 'alternate'),

=== modified file 'examples/run_test_vm.py'
--- examples/run_test_vm.py	2012-10-18 14:35:42 +0000
+++ examples/run_test_vm.py	2012-11-08 15:07:21 +0000
@@ -23,8 +23,7 @@
     parser.add_argument('runlists', metavar='runlist', nargs='+',
                         help='URLs of runlist files to run')
     parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=('hardy', 'lucid', 'natty',
-                                 'oneiric', 'precise', 'quantal'),
+                        choices=config.serieschoices,
                         help='Series to use for VM creation (%(choices)s)')
     parser.add_argument('-t', '--type', metavar='TYPE',
                         choices=('desktop', 'server', 'mini', 'alternate'),

=== modified file 'examples/run_utah_tests.py'
--- examples/run_utah_tests.py	2012-10-19 21:57:01 +0000
+++ examples/run_utah_tests.py	2012-11-08 15:07:21 +0000
@@ -26,7 +26,7 @@
     parser.add_argument('runlists', metavar='runlist', nargs='+',
                         type=url_argument, help='URLs of runlist files to run')
     parser.add_argument('-m', '--machinetype', metavar='MACHINETYPE',
-                        choices=('physical', 'virtual'), default='virtual',
+                        choices=('physical', 'virtual'),
                         help='Type of machine to provision (%(choices)s)')
     parser.add_argument('-e', '--emulator',
                         help=('Emulator to use (kvm and qemu are supported, '
@@ -47,8 +47,7 @@
                         help=('Size in gigabytes of virtual disk, '
                               'specify more than once for multiple disks'))
     parser.add_argument('-s', '--series', metavar='SERIES',
-                        choices=('hardy', 'lucid', 'natty',
-                                 'oneiric', 'precise', 'quantal'),
+                        choices=config.serieschoices,
                         help='Series to use for installation (%(choices)s)')
     parser.add_argument('-t', '--type', metavar='TYPE',
                         choices=('desktop', 'server', 'mini', 'alternate'),
@@ -87,10 +86,15 @@
     if args is None:
         args = get_parser().parse_args()
 
+    if args.machinetype is None:
+        machinetype = config.machinetype
+    else:
+        machinetype = args.machinetype
+
     if args.arch is not None and 'arm' in args.arch:
         from run_test_bamboo_feeder import run_test_bamboo_feeder
         function = run_test_bamboo_feeder
-    elif args.machinetype == 'physical':
+    elif machinetype == 'physical':
         from run_test_cobbler import run_test_cobbler
         function = run_test_cobbler
     else:

=== modified file 'utah/config.py'
--- utah/config.py	2012-11-06 16:47:07 +0000
+++ utah/config.py	2012-11-08 15:07:21 +0000
@@ -12,6 +12,8 @@
 import socket
 import subprocess
 
+from utah.exceptions import UTAHException
+
 
 def getbridge():
     """
@@ -26,71 +28,178 @@
         return 'virbr0'
 
 DEFAULTS = dict(
-    arch='i386',
+    # Default kernel parameters
+    boot=None,
+    # Time to wait for installed system to boot
     boottimeout=90,
+    # Time to wait between checking if system is available over ssh
     checktimeout=15,
+    # Default log level to print to the console
     consoleloglevel=logging.WARNING,
+    # Default debug setting
     debug=False,
+    # Default diskbus for VMs
+    diskbus='virtio',
+    # Default disk size list for VMs (in GB)
+    disksizes=[8],
+    # Default emulator for VMs
+    # If None, kvm will be used if available, otherwise qemu
+    emulator=None,
+    # Default log level to write to log file
     fileloglevel=logging.INFO,
+    # Group for file ownership and permissions
     group='utah',
+    # Default image to use for system installation
     image=None,
+    # Default initrd to use for system installation
     initrd=None,
+    # Packages to install on system
     installpackages=['openssh-server', 'gdebi'],
+    # Time limit for overall install process
     installtimeout=3600,
-    installtype='desktop',
+    # Default install type (mini is default to save bandwidth and space)
+    installtype='mini',
+    # Default kernel for installation
     kernel=None,
+    # Default location of log directory
     logpath=os.path.join('/', 'var', 'log', 'utah'),
+    # Default machine ID
     machineid=None,
+    # Default machine type
+    machinetype='virtual',
+    # Default machine name
     name=None,
+    # Default setting of installing a new machine vs. using an existing one
     new=False,
-    nfscommand=['sudo', os.path.join('/', 'etc', 'init.d', 'nfs-kernel-server'), 'reload'],
+    # Command to reload NFS configuration
+    # NFS options currently only used for cobbler-based desktop installs
+    nfscommand=['sudo', os.path.join('/', 'etc', 'init.d',
+                'nfs-kernel-server'), 'reload'],
+    # Path to NFS config file
     nfsconfigfile=os.path.join('/', 'etc', 'exports'),
+    # Default options for NFS shares
     nfsoptions='*(ro,async,no_root_squash,no_subtree_check)',
+    # Time to wait between power off and power on for physical systems
     powertimeout=15,
-    preseed=None,
+    # Default preseed
+    preseed=os.path.join('/', 'etc', 'utah', 'default-preseed.cfg'),
+    # Location of PXE configuration files
     pxedir=os.path.join('/', 'var', 'lib', 'tftpboot', 'pxelinux.cfg'),
+    # libvirt URL for virtual machine creation
     qemupath='qemu:///system',
+    # Default setting for configuration rewriting
     rewrite='all',
-    series='precise',
+    # Available releases
+    serieschoices=[           # Remember to update uqt-vm-tools.conf as well
+                   'hardy',
+                   'lucid',
+                   'oneiric',
+                   'precise',
+                   'quantal',
+                   'raring',
+                   ],
+    # Default machine template
     template=None,
+    # Directory to hold web-accessible files
     wwwdir=os.path.join('/', 'var', 'www', 'utah'),
+    # Default VM XML file
+    xml=os.path.join('/', 'etc', 'utah', 'default-vm.xml'),
 )
 
 # These depend on the local user/path, and need to be filtered out
 # of the config file created at package build time.
 LOCALDEFAULTS = dict(
+    # Default network bridge for machines
     bridge=getbridge(),
+    # Hostname (used for logfile among other things)
     hostname=socket.gethostname(),
+    # SSH private key to use for provisioned machine logins
     sshprivatekey=os.path.join(os.path.expanduser('~'), '.ssh', 'utah'),
+    # SSH public key to install on provisioned machines
     sshpublickey=os.path.join(os.path.expanduser('~'), '.ssh', 'utah.pub'),
-    sshknownhosts=os.path.join(os.path.expanduser('~'), '.ssh', 'known_hosts'),
+    # SSH known hosts file
+    sshknownhosts=os.path.join(os.path.expanduser('~'), '.ssh',
+                               'known_hosts'),
+    # User to install and use on provisioned machines
     user=getpass.getuser(),
+    # Path for VM files
     vmpath=os.path.join(os.path.expanduser('~'), 'vm'),
 )
 
 # These depend on other config options, so they're added last.
+# Default logfile is /var/log/utah/{hostname}.log
 LOCALDEFAULTS['logfile'] = os.path.join(DEFAULTS['logpath'],
                                         LOCALDEFAULTS['hostname'] + '.log')
+# Default logfile is /var/log/utah/{hostname}-debug.log
+# Set to None to disable separate debug log
 LOCALDEFAULTS['debuglog'] = os.path.join(DEFAULTS['logpath'],
                                     LOCALDEFAULTS['hostname'] + '-debug.log')
 
+# This depends on a binary that may not be installed.
+# Also, the null thing may seem obvious, but I found it here:
+# http://stackoverflow.com/questions/699325/
+# suppress-output-in-python-calls-to-executables
+with open(os.devnull, 'w') as fnull:
+    if subprocess.call(['which', 'dpkg-architecture'],
+                       stdout=fnull, stderr=fnull) == 0:
+        # If dpkg-architecture is available, default to current host arch
+        LOCALDEFAULTS['arch'] = subprocess.check_output(
+                ['dpkg-architecture', '-qDEB_HOST_ARCH']).strip()
+    else:
+        # Otherwise, default to i386
+        LOCALDEFAULTS['arch'] = 'i386'
+        
+# I'm not sure lsb_release is always around
+with open(os.devnull, 'w') as fnull:
+    if subprocess.call(['which', 'lsb_release'],
+                       stdout=fnull, stderr=fnull) == 0:
+        # If lsb_release is available, default to current series
+        LOCALDEFAULTS['series'] = subprocess.check_output(
+                ['lsb_release', '-sc']).strip()
+    else:
+        # Otherwise, default to precise
+        LOCALDEFAULTS['series'] = 'precise'
+
 DEFAULTS.update(LOCALDEFAULTS)
 
 CONFIG = {}
 CONFIG.update(DEFAULTS)
 
 # Process config files.
-files = ['/etc/utah/config', '~/.utah/config', os.getenv('UTAH_CONFIG_FILE')]
+# First, the standard /etc/utah/config file is processed
+# Second, anything in /etc/utah/conf.d
+# Third, any existing ~/.utah/config file
+# Fourth, anything in ~/.utah/conf.d
+# Fifth, a file referred to by UTAH_CONFIG_FILE
+# Sixth, anything in UTAH_CONFIG_DIR
+# Technically, all files will process as directories, and vice versa
+files = []
+paths = ['/etc/utah/config', '/etc/utah/conf.d', '~/.utah/config',
+         '~/.utah/conf.d', os.getenv('UTAH_CONFIG_FILE'),
+         os.getenv('UTAH_CONFIG_DIR')]
+for path in paths:
+    if path is not None:
+        abspath = os.path.expanduser(path)
+        if os.path.isfile(abspath):
+            files.append(abspath)
+        elif os.path.isdir(abspath):
+            for walkdir, _dirs, walkfiles in os.walk(abspath):
+                for walkfile in walkfiles:
+                    files.append(os.path.join(abspath, walkdir, walkfile))
 for conffile in files:
-    if conffile is not None:
-        myfile = os.path.expanduser(conffile)
-        if os.path.isfile(myfile) and os.path.getsize(myfile) > 0:
-            with open(myfile) as fp:
+    if os.path.isfile(conffile) and os.path.getsize(conffile) > 0:
+        with open(conffile) as fp:
+            try:
                 CONFIG.update(json.load(fp))
-
+            except ValueError:
+                raise UTAHException(conffile + ' is not a valid JSON file')
+
+
+# Allow variables to be accessed via config.variable
 locals().update(CONFIG)
 
 
+# Dump the default values to create a configuration file
 def dumpdefaults(build=False):
     if build:
         # Remove user and path dependent items so they won't get set on the
@@ -100,6 +209,7 @@
     return json.dumps(DEFAULTS, sort_keys=True, indent=4)
 
 
+# Dump all config values
 def dumpconfig():
     return json.dumps(CONFIG, sort_keys=True, indent=4)
 

=== modified file 'utah/provisioning/baremetal/bamboofeeder.py'
--- utah/provisioning/baremetal/bamboofeeder.py	2012-10-19 21:05:04 +0000
+++ utah/provisioning/baremetal/bamboofeeder.py	2012-11-08 15:07:21 +0000
@@ -24,8 +24,8 @@
     """
     Provide a class to provision an ARM board from a bamboo-feeder setup.
     """
-    def __init__(self, boot=None, cargs=None, inventory=None,
-                 name=None, powercmd=None, preboot=None, *args, **kw):
+    def __init__(self, cargs=None, inventory=None, name=None, powercmd=None,
+                 preboot=None, *args, **kw):
         # TODO: change the name of cargs here and elsewhere
         # TODO: respect rewrite setting
         if name is None:
@@ -174,7 +174,7 @@
         Add the needed options to the command line for an automatic install.
         """
         if boot is None:
-            boot = ''
+            boot = self.boot
         super(BambooFeederMachine, self)._cmdlinesetup(boot=boot)
         # TODO: minimize these
         for option in ('auto', 'ro', 'text'):

=== modified file 'utah/provisioning/baremetal/cobbler.py'
--- utah/provisioning/baremetal/cobbler.py	2012-10-29 11:26:22 +0000
+++ utah/provisioning/baremetal/cobbler.py	2012-11-08 15:07:21 +0000
@@ -24,8 +24,8 @@
     Provide a class to provision a machine via cobbler.
     """
     # TODO: may need to fix DHCP/hostname issues, may just be magners
-    def __init__(self, boot=None, cargs=None, inventory=None,
-                 name=None, preseed=None, *args, **kw):
+    def __init__(self, cargs=None, inventory=None, name=None, preseed=None,
+                 *args, **kw):
         if name is None:
             raise UTAHBMProvisioningException(
                     'Machine name reqired for cobbler machine')
@@ -42,8 +42,7 @@
         if self.image is None:
             raise UTAHBMProvisioningException(
                     'Image file required for cobbler installation')
-        self._custominit(arch=self.arch, boot=boot,
-                         installtype=self.installtype, series=self.series)
+        self._custominit()
         # TODO: verify we have nfs support for desktop image
 
         # TODO: Rework cinitrd to be less of a confusing collection of kludges

=== modified file 'utah/provisioning/provisioning.py'
--- utah/provisioning/provisioning.py	2012-10-25 20:07:44 +0000
+++ utah/provisioning/provisioning.py	2012-11-08 15:07:21 +0000
@@ -47,9 +47,9 @@
     * stop, uploadfiles, downloadfiles, run
       (these must be implemented separately.)
     """
-    def __init__(self, arch=None, clean=None, debug=False, directory=None,
-                 image=None, dlpercentincrement=1, initrd=None,
-                 installtype=None, kernel=None, machineid=None,
+    def __init__(self, arch=None, boot=None, clean=None, debug=False,
+                 directory=None, image=None, dlpercentincrement=1,
+                 initrd=None, installtype=None, kernel=None, machineid=None,
                  machineuuid=None, name=None, new=False, prefix='utah',
                  preseed=None, rewrite=None, series=None, template=None,
                  xml=None):
@@ -96,14 +96,11 @@
                      none |         |        |        |       |
         """
         # TODO: Make this work right with super at some point.
-        self.arch = arch
         self.debug = debug
         self.dlpercentincrement = dlpercentincrement
-        self.installtype = installtype
         self.machineid = machineid
         self.new = new
         self.prefix = prefix
-        self.series = series
         self.template = template
 
         if clean is None:
@@ -118,10 +115,26 @@
         self._namesetup(name)
         self._dirsetup(directory)
 
+        if arch is None:
+            self.arch = config.arch
+        else:
+            self.arch = arch
+        if boot is None:
+            self.boot = config.boot
+        else:
+            self.boot = boot
+        if installtype is None:
+            self.installtype = config.installtype
+        else:
+            self.installtype = installtype
         if rewrite is None:
             self.rewrite = config.rewrite
         else:
             self.rewrite = rewrite
+        if series is None:
+            self.series = config.series
+        else:
+            self.series = series
 
         if machineuuid is None:
             self.uuid = str(uuid.uuid4())
@@ -133,10 +146,12 @@
         self._loggersetup()
 
         if preseed is None:
-            preseed = '/etc/utah/default-preseed.cfg'
-
-        fileargs = ['preseed', 'xml', 'kernel', 'initrd']
-
+            preseed = config.preseed
+
+        fileargs = ['initrd', 'kernel', 'preseed', 'xml']
+
+        if image is None:
+            image = config.image
         if image is None:
             self.image = None
         elif image.endswith('.iso'):
@@ -150,6 +165,8 @@
             # Ensure every file/url type argument is available locally
             arg = locals()[item]
             if arg is None:
+                arg = getattr(config, item)
+            if arg is None:
                 setattr(self, item, None)
             else:
                 if arg.startswith('~'):
@@ -1123,7 +1140,9 @@
         Add the needed options to the command line for an automatic install.
         """
         if boot is None:
-            self.cmdline = ''
+            self.cmdline = self.boot
+        if boot is None:
+            self.cmdline =''
         else:
             self.cmdline = boot
         self.boottimeout = config.boottimeout

=== modified file 'utah/provisioning/vm/libvirtvm.py'
--- utah/provisioning/vm/libvirtvm.py	2012-10-19 21:57:01 +0000
+++ utah/provisioning/vm/libvirtvm.py	2012-11-08 15:07:21 +0000
@@ -142,16 +142,11 @@
     """
     Provide a class to provision a VM using the ubuntu-qa-tools vm-tools.
     """
-    def __init__(self, arch='i386', installtype='desktop', machineid=None,
-                 prefix='utah', series='precise', *args, **kw):
+    def __init__(self, machineid=None, prefix='utah', *args, **kw):
         if not apt.cache.Cache()['vm-tools'].is_installed:
             raise UTAHVMProvisioningException('vm-tools is not installed.  '
                     'Try: sudo apt-get install vm-tools')
-        super(VMToolsVM, self).__init__(*args, arch=arch,
-                                        installtype=installtype,
-                                        machineid=machineid,
-                                        name=None,
-                                        series=series,
+        super(VMToolsVM, self).__init__(*args, machineid=machineid, name=None,
                                         **kw)
         self.logger.debug('VMToolsVM init finished')
 
@@ -346,10 +341,9 @@
     """
     Install a VM from an image using libvirt direct kernel booting.
     """
-    def __init__(self, arch=None, boot=None, diskbus=None, disksizes=None,
-                 emulator=None, image=None, initrd=None, installtype=None,
-                 kernel=None, machineid=None, macs=None, name=None,
-                 prefix='utah', series=None, xml=None, *args, **kw):
+    def __init__(self, diskbus=None, disksizes=None, emulator=None,
+                 machineid=None, macs=None, name=None, prefix='utah', *args,
+                 **kw):
         # Make sure that no other virtualization solutions are running
         # TODO: see if this is needed for qemu or just kvm
         process_checker = ProcessChecker()
@@ -360,10 +354,12 @@
                 raise UTAHVMProvisioningException(message)
 
         if diskbus is None:
-            self.diskbus = 'virtio'
+            self.diskbus = config.diskbus
         else:
             self.diskbus = diskbus
         if disksizes is None:
+            disksizes = config.disksizes
+        if disksizes is None:
             self.disksizes = [8]
         else:
             self.disksizes = disksizes
@@ -372,25 +368,22 @@
             name = '-'.join([str(prefix), str(machineid)])
         else:
             autoname = False
-        if xml is None:
-            xml = '/etc/utah/default-vm.xml'
-        super(CustomVM, self).__init__(arch=arch, image=image, initrd=initrd,
-                                       installtype=installtype, kernel=kernel,
-                                       machineid=machineid, name=name,
-                                       series=series, xml=xml, *args, **kw)
+        super(CustomVM, self).__init__(machineid=machineid, name=name, *args,
+                                       **kw)
         # TODO: do a better job of separating installation
         # into _create rather than __init__
         if self.image is None:
             raise UTAHVMProvisioningException('Image file required '
                                               'for custom VM installation')
-        self._custominit(arch=arch, boot=boot,
-                         installtype=installtype, series=series)
+        self._custominit()
         if autoname:
             self._namesetup()
             self._loggerunsetup()
             self._loggersetup()
             self._dirsetup()
         if emulator is None:
+            emulator = config.emulator
+        if emulator is None:
             if self._supportsdomaintype('kvm'):
                 self.logger.info('Setting type to kvm '
                                  'since it is present in libvirt capabilities')
@@ -412,7 +405,6 @@
         if macs is None:
             macs = []
         self.macs = macs
-        self.xml = xml
         self.dircheck()
         self.logger.debug('CustomVM init finished')