Merge lp:~ltrager/maas-image-builder/update_ks into lp:maas-image-builder/0.9

[Lee Trager]

Cleanup and standardize all kickstart config files.

[Blake Rouse (blake-rouse)]

This is into the wrong code repository. This project has also switched to git, please update this branch to merge into the git repo.

review: Disapprove

Unmerged revisions

55. By Lee Trager on 2017-06-11

Clean up kickstart files

54. By Blake Rouse on 2017-06-09

Fix release 1.0.5 revision number.

53. By Blake Rouse on 2017-06-09

Release 1.0.5.

52. By Blake Rouse on 2017-06-09

Only allow VNC to windows build locally.

51. By Blake Rouse on 2017-06-09

Make kpartx_del handle failure and retry for up to 10 seconds.

50. By Blake Rouse on 2017-06-09

Fix --windows-drivers to work.

49. By Blake Rouse on 2017-06-09

Fix PEP8 errors in CentOS curtin hooks.

48. By Blake Rouse on 2017-05-31

Update changelog for 1.0.4 release.

47. By Blake Rouse on 2017-05-31

Modify RHEL to use the CentOS Curtin hooks.

46. By Blake Rouse on 2017-05-31

Allow customization of CentOS and RHEL images

Adds the --custom-kickstart flag to the centos and rhel commands. This command allows a user to specify a custom kickstart file which is run after the builtin one runs.

=== modified file '.bzrignore'
--- .bzrignore	2015-03-14 19:29:17 +0000
+++ .bzrignore	2017-06-13 16:13:40 +0000
@@ -1,18 +1,4 @@
-*.egg
-*.egg-info
-./.installed.cfg
-./bin
+./.tox
 ./build
 ./debian/changelog
-./develop-eggs
-./dist
-./eggs
-./include
-./lib
-./local
-./parts
-./run/*
-./TAGS
-./tags
-dropin.cache
-.idea
+*.egg-info

=== modified file 'LICENSE'
--- LICENSE	2015-03-10 20:42:06 +0000
+++ LICENSE	2017-06-13 16:13:40 +0000
@@ -1,4 +1,4 @@
-MAAS Image Builder is Copyright 2015 Canonical Ltd.
+MAAS Image Builder is Copyright 2017 Canonical Ltd.
 
 Canonical Ltd ("Canonical") distributes the MAAS Image Builder source code
 under the GNU Affero General Public License, version 3 ("AGPLv3").

=== modified file 'Makefile'
--- Makefile	2015-03-15 13:36:38 +0000
+++ Makefile	2017-06-13 16:13:40 +0000
@@ -1,21 +1,3 @@
-python := python2.7
-
-# Network activity can be suppressed by setting offline=true (or any
-# non-empty string) at the command-line.
-ifeq ($(offline),)
-buildout := bin/buildout
-virtualenv := virtualenv
-else
-buildout := bin/buildout buildout:offline=true
-virtualenv := virtualenv --never-download
-endif
-
-build: \
-	bin/buildout \
-	bin/maas-image-builder
-
-all: build
-
 # Install all packages required for MAAS image builder development & operation
 # on the system. This may prompt for a password.
 install-dependencies:
@@ -23,107 +5,25 @@
 		--no-install-recommends install $(shell sort -u \
 			$(addprefix required-packages/,base build dev))
 
-bin/python:
-	$(virtualenv) --python=$(python) --system-site-packages $(CURDIR)
-
-bin/buildout: bin/python bootstrap/zc.buildout-1.5.2.tar.gz
-	bin/python -m pip --quiet install --ignore-installed \
-		--no-dependencies bootstrap/zc.buildout-1.5.2.tar.gz
-	$(RM) -f README.txt  # zc.buildout installs an annoying README.txt.
-	@touch --no-create $@  # Ensure it's newer than its dependencies.
-
-bin/maas-image-builder: \
-	bin/buildout buildout.cfg setup.py
-	# Install the egg-info so stevedore can find the entry points.
-	bin/python -m pip --quiet install --ignore-installed \
-		--no-dependencies -e .
-	$(buildout) install mib
-	@touch --no-create $@
-
-bin/flake8: bin/buildout buildout.cfg versions.cfg setup.py
-	$(buildout) install flake8
-	@touch --no-create $@
-
-lint: lint-py
-
-pocketlint = $(call available,pocketlint,python-pocket-lint)
-
-# Python lint checks are time-intensive, so we run them in parallel.  It may
-# make things matters worse if the files need to be read from disk, though, so
-# this may need more tuning.
-# The -n50 -P4 setting roughly doubled speed on a high-end system with SSD and
-# all the files in cache.
-lint-py: sources = $(wildcard *.py contrib/*.py) src contrib
-lint-py: bin/flake8
-	@find $(sources) -name '*.py' -print0 \
-		| xargs -r0 -n50 -P4 bin/flake8 --ignore=E123 --config=/dev/null
-
-lint-doc:
-	@./utilities/doc-lint
-
-# Apply automated formatting to all Python files.
-format: sources = $(wildcard *.py contrib/*.py) src contrib
-format:
-	@find $(sources) -name '*.py' -print0 | xargs -r0 ./utilities/format-imports
-
-check: clean
-
-clean:
-	find . -type f -name '*.py[co]' -print0 | xargs -r0 $(RM)
-	find . -type f -name '*~' -print0 | xargs -r0 $(RM)
-	find . -type f -name dropin.cache -print0 | xargs -r0 $(RM)
-	$(RM) coverage.data coverage.xml
-	$(RM) -r coverage
-
-distclean: clean
-	$(RM) -r bin include lib local
-	$(RM) -r eggs develop-eggs
-	$(RM) -r build dist logs/* parts
-	$(RM) tags TAGS .installed.cfg
-	$(RM) -r *.egg *.egg-info src/*.egg-info
+lint:
+	@tox
 
 package_export: VER = $(shell dpkg-parsechangelog -ldebian/changelog | sed -rne 's,^Version: ([^-]+).*,\1,p')
 package_export: TARBALL = maas-image-builder_$(VER).orig.tar.gz
 package_export:
 	@$(RM) -f build/$(TARBALL)
 	@mkdir -p build
-	@bzr export --root=maas-image-builder-$(VER).orig build/$(TARBALL) $(CURDIR)
+	@bzr export $(packaging-export-extra) \
+            --root=maas-image-builder-$(VER).orig build/$(TARBALL) $(CURDIR)
 
 package: package_export
-	bzr bd --result-dir=build --build-dir=build
+	bzr bd --result-dir=build --build-dir=build -- $(packaging-build-extra)
+
+package-dev: packaging-export-extra = --uncommitted
+package-dev: packaging-build-extra = -uc -us
+package-dev: package
 
 source_package: package_export
 	bzr bd --result-dir=build --build-dir=build -S
 
-#
-# Phony stuff.
-#
-
-define phony
-  build
-  check
-  clean
-  distclean
-  format
-  install-dependencies
-  lint
-  lint-py
-  package
-  source_package
-endef
-
-phony := $(sort $(strip $(phony)))
-
-.PHONY: $(phony)
-
-#
-# Functions.
-#
-
-# Check if a command is found on PATH. Raise an error if not, citing
-# the package to install. Return the command otherwise.
-# Usage: $(call available,<command>,<package>)
-define available
-  $(if $(shell which $(1)),$(1),$(error $(1) not found; \
-	install it with 'sudo apt-get install $(2)'))
-endef
+.PHONY: check install-dependencies

=== modified file 'README'
--- README	2015-07-31 18:46:41 +0000
+++ README	2017-06-13 16:13:40 +0000
@@ -1,8 +1,8 @@
 .. -*- mode: rst -*-
 
-************************
+******************
 MAAS Image Builder
-************************
+******************
 
 Automated builder for creating images that can be deployed by MAAS and
 installed by the curtin installer. For information on MAAS visit
@@ -12,3 +12,10 @@
 Supported Operating Systems:
  - CentOS 6 (i386, amd64)
  - CentOS 7 (amd64)
+ - RedHat Enterprise Linux 7 (amd64)
+ - Windows Server 2008 (i386, amd64)
+ - Windows Server 2008 R2 (i386, amd64)
+ - Windows Server 2012 (i386, amd64)
+ - Windows Server 2012 R2 (i386, amd64)
+ - Windows Hyper-V Server 2012 (i386, amd64)
+ - Windows Hyper-V Server 2012 R2 (i386, amd64)

=== removed directory 'bootstrap'
=== removed file 'bootstrap/zc.buildout-1.5.2.tar.gz'
Binary files bootstrap/zc.buildout-1.5.2.tar.gz	2015-03-10 20:42:06 +0000 and bootstrap/zc.buildout-1.5.2.tar.gz	1970-01-01 00:00:00 +0000 differ
=== removed file 'buildout.cfg'
--- buildout.cfg	2015-03-11 15:52:11 +0000
+++ buildout.cfg	1970-01-01 00:00:00 +0000
@@ -1,49 +0,0 @@
-[buildout]
-parts =
-  mib
-extensions = buildout-versions
-buildout_versions_file = versions.cfg
-versions = versions
-extends = versions.cfg
-offline = false
-newest = false
-include-site-packages = true
-prefer-final = true
-allow-picked-versions = true
-
-[common]
-extra-paths =
-  ${buildout:directory}/src
-test-eggs =
-  coverage
-  fixtures
-  mock
-  nose
-  python-subunit
-  sst
-  testresources
-  testscenarios
-  testtools
-initialization =
-  from os import environ
-  environ.setdefault("MIB_CONTRIB_DIR", "${buildout:directory}/contrib")
-
-[mib]
-recipe = zc.recipe.egg
-eggs =
-  ${common:test-eggs}
-entry-points =
-  maas-image-builder=mib.core:execute
-initialization =
-  ${common:initialization}
-scripts =
-  maas-image-builder
-extra-paths =
-  ${common:extra-paths}
-
-[flake8]
-recipe = zc.recipe.egg
-eggs =
-  flake8
-entry-points =
-  flake8=flake8.run:main

=== modified file 'contrib/centos/centos6/centos6-amd64.ks'
--- contrib/centos/centos6/centos6-amd64.ks	2015-03-11 18:57:11 +0000
+++ contrib/centos/centos6/centos6-amd64.ks	2017-06-13 16:13:40 +0000
@@ -1,159 +1,111 @@
-#version=DEVEL
+#version=CentOS6
+install
+# Poweroff after installation
+poweroff
+# System authorization information
+auth --enableshadow --passalgo=sha512
 # Firewall configuration
 firewall --enabled --service=ssh
-repo --name="repo0" --baseurl=http://mirror.centos.org/centos/6/os/x86_64/
-repo --name="repo1" --baseurl=http://mirror.centos.org/centos/6/updates/x86_64/
-repo --name="repo2" --baseurl=http://dl.fedoraproject.org/pub/epel/6/x86_64/
-# Root password
-rootpw --iscrypted --lock $1$2e74e5$wMj25e4rEb4rJxqm7BAnk0
-# System authorization information
-auth --useshadow --enablemd5
-# System keyboard
+firstboot --disable
+ignoredisk --only-use=vda
+# Keyboard layouts
 keyboard us
 # System language
 lang en_US.UTF-8
-# SELinux configuration
-selinux --enforcing
-# Installation logging level
-logging --level=info
-# Reboot after installation
-reboot
-# System services
-services --disabled="avahi-daemon,iscsi,iscsid,firstboot,kdump" --enabled="network,sshd,rsyslog,tuned"
-# System timezone
-timezone --isUtc America/New_York
+repo --name "os" --baseurl="http://mirror.centos.org/centos/6/os/x86_64"
+repo --name "updates" --baseurl="http://mirror.centos.org/centos/6/updates/x86_64"
+repo --name="epel" --baseurl=http://dl.fedoraproject.org/pub/epel/6/x86_64/
 # Network information
 network  --bootproto=dhcp --device=eth0 --onboot=on
 # System bootloader configuration
-bootloader --append="console=ttyS0,115200n8 console=tty0" --location=mbr --driveorder="sda" --timeout=1
-# Clear the Master Boot Record
+bootloader --append="console=ttyS0,115200n8 console=tty0" --location=mbr --driveorder="vda" --timeout=1
+# Root password
+rootpw --iscrypted nothing
+selinux --enforcing
+services --disabled="kdump" --enabled="network,sshd,rsyslog,chronyd"
+timezone UTC --isUtc
+# Disk
 zerombr
-# Partition clearing information
-clearpart --all
-# Disk partitioning information
+clearpart --all --initlabel 
 part / --fstype="ext4" --size=3072
 
-%post
+%post --erroronfail
+
+# workaround anaconda requirements
+passwd -d root
+passwd -l root
+
+# remove avahi and networkmanager
+echo "Removing avahi/zeroconf and NetworkManager"
+yum -C -y remove avahi\* Network\*
 
 # make sure firstboot doesn't start
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
-cat <<EOL >> /etc/rc.local
-if [ ! -d /root/.ssh ] ; then
-    mkdir -p /root/.ssh
-    chmod 0700 /root/.ssh
-    restorecon /root/.ssh
-fi
-EOL
-
-cat <<EOL >> /etc/ssh/sshd_config
-UseDNS no
-PermitRootLogin without-password
-EOL
-
-# bz705572
-ln -s /boot/grub/grub.conf /etc/grub.conf
-
-# bz688608
-sed -i 's|\(^PasswordAuthentication \)yes|\1no|' /etc/ssh/sshd_config
-
-# allow sudo powers to cloud-user
-echo -e 'cloud-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-
-#bz912801
-# prevent udev rules from remapping nics
-touch /etc/udev/rules.d/75-persistent-net-generator.rules
-
-#setup getty on ttyS0
-echo "ttyS0" >> /etc/securetty
-cat <<EOF > /etc/init/ttyS0.conf
-start on stopped rc RUNLEVEL=[2345]
-stop on starting runlevel [016]
-respawn
-instance /dev/ttyS0
-exec /sbin/agetty /dev/ttyS0 115200 vt100-nav
+echo "Cleaning old yum repodata."
+yum clean all
+
+# chance dhcp client retry/timeouts to resolve #6866
+cat  >> /etc/dhcp/dhclient.conf << EOF
+
+timeout 300;
+retry 60;
 EOF
 
-# lock root password
-passwd -d root
-passwd -l root
-
 # clean up installation logs"
-yum clean all
 rm -rf /var/log/yum.log
 rm -rf /var/lib/yum/*
 rm -rf /root/install.log
 rm -rf /root/install.log.syslog
 rm -rf /root/anaconda-ks.cfg
 rm -rf /var/log/anaconda*
+rm -rf /root/anac*
+
 %end
 
-%packages --nobase
-acpid
-attr
-audit
-authconfig
-basesystem
-bash
+%packages
+@core
+chrony
 cloud-init
-coreutils
-cpio
-cronie
-device-mapper
-dhclient
-dracut
-e2fsprogs
+cloud-utils-growpart
 efibootmgr
-filesystem
-glibc
+epel-release
 grub
-heat-cfntools
-initscripts
-iproute
-iptables
-iptables-ipv6
-iputils
-kbd
 kernel
-kpartx
-ncurses
-net-tools
-nfs-utils
-openssh-clients
-openssh-server
-parted
-passwd
-policycoreutils
-procps
-python-oauth
-rootfiles
-rpm
 rsync
-rsyslog
-selinux-policy
-selinux-policy-targeted
-sendmail
-setup
-shadow-utils
-sudo
-syslinux
 tar
-tuned
-util-linux-ng
-vim-minimal
-yum
-yum-metadata-parser
+yum-utils
+python-oauth
 -NetworkManager
--b43-openfwwf
--biosdevname
--fprintd
--fprintd-pam
--gtk2
--libfprint
--mcelog
+-aic94xx-firmware
+-alsa-firmware
+-alsa-lib
+-alsa-tools-firmware
+-iprutils
+-ivtv-firmware
+-iwl100-firmware
+-iwl1000-firmware
+-iwl105-firmware
+-iwl135-firmware
+-iwl2000-firmware
+-iwl2030-firmware
+-iwl3160-firmware
+-iwl3945-firmware
+-iwl4965-firmware
+-iwl5000-firmware
+-iwl5150-firmware
+-iwl6000-firmware
+-iwl6000g2a-firmware
+-iwl6000g2b-firmware
+-iwl6050-firmware
+-iwl7260-firmware
+-iwl7265-firmware
+-libertas-sd8686-firmware
+-libertas-sd8787-firmware
+-libertas-usb8388-firmware
 -plymouth
--redhat-support-tool
--system-config-*
--wireless-tools
+-postfix
+-wpa_supplicant
 
 %end
+

=== modified file 'contrib/centos/centos6/curtin/curtin-hooks'
--- contrib/centos/centos6/curtin/curtin-hooks	2015-07-28 22:00:23 +0000
+++ contrib/centos/centos6/curtin/curtin-hooks	1970-01-01 00:00:00 +0000
@@ -1,342 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-import os
-import re
-import sys
-
-sys.path.append('/curtin')
-from curtin import (
-    block,
-    net,
-    util,
-    )
-
-"""
-CentOS 6
-
-Currently Support:
-
-- Legacy boot
-- DHCP of BOOTIF
-
-Not Supported:
-
-- UEFI boot (*Bad support, most likely wont support)
-- Multiple network configration
-- IPv6
-"""
-
-FSTAB_PREPEND = """\
-#
-# /etc/fstab
-# Created by MAAS fast-path installer.
-#
-# Accessible filesystems, by reference, are maintained under '/dev/disk'
-# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
-#
-"""
-
-FSTAB_APPEND = """\
-tmpfs                   /dev/shm                tmpfs   defaults        0 0
-devpts                  /dev/pts                devpts  gid=5,mode=620  0 0
-sysfs                   /sys                    sysfs   defaults        0 0
-proc                    /proc                   proc    defaults        0 0
-"""
-
-GRUB_CONF = """\
-#
-# /boot/grub/grub.conf
-# Created by MAAS fast-path installer.
-#
-default 0
-timeout 0
-title MAAS
- root {grub_root}
- kernel /boot/{vmlinuz} root=UUID={root_uuid} {extra_opts}
- initrd /boot/{initrd}
-"""
-
-
-def get_block_devices(target):
-    """Returns list of block devices for the given target."""
-    devs = block.get_devices_for_mp(target)
-    blockdevs = set()
-    for maybepart in devs:
-        (blockdev, part) = block.get_blockdev_for_partition(maybepart)
-        blockdevs.add(blockdev)
-    return list(blockdevs)
-
-
-def get_root_info(target):
-    """Returns the root partitions information."""
-    rootpath = block.get_devices_for_mp(target)[0]
-    rootdev = os.path.basename(rootpath)
-    blocks = block._lsblock()
-    return blocks[rootdev]
-
-
-def read_file(path):
-    """Returns content of a file."""
-    with open(path, 'rb') as stream:
-        return stream.read().encode('utf-8')
-
-
-def write_fstab(target, curtin_fstab):
-    """Writes the new fstab, using the fstab provided
-    from curtin."""
-    fstab_path = os.path.join(target, 'etc', 'fstab')
-    fstab_data = read_file(curtin_fstab)
-    with open(fstab_path, 'w') as stream:
-        stream.write(FSTAB_PREPEND)
-        stream.write(fstab_data)
-        stream.write(FSTAB_APPEND)
-
-
-def extract_kernel_params(data):
-    """Extracts the kernel parametes from the provided
-    grub config data."""
-    match = re.search('^\s+kernel (.+?)$', data, re.MULTILINE)
-    return match.group(0)
-
-
-def strip_kernel_params(params, strip_params=[]):
-    """Removes un-needed kernel parameters."""
-    new_params = []
-    for param in params:
-        remove = False
-        for strip in strip_params:
-             if param.startswith(strip):
-                 remove = True
-                 break
-        if remove is False:
-            new_params.append(param)
-    return new_params
-
-
-def get_boot_file(target, filename):
-    """Return the full filename of file in /boot on target."""
-    boot_dir = os.path.join(target, 'boot')
-    files = [
-        fname
-        for fname in os.listdir(boot_dir)
-        if fname.startswith(filename)
-        ]
-    if not files:
-        return None
-    return files[0]
-
-
-def write_grub_conf(target, grub_root, extra=[]):
-    """Writes a new /boot/grub/grub.conf with the correct
-    boot arguments."""
-    root_info = get_root_info(target)
-    grub_path = os.path.join(target, 'boot', 'grub', 'grub.conf')
-    extra_opts = ' '.join(extra)
-    vmlinuz = get_boot_file(target, 'vmlinuz')
-    initrd = get_boot_file(target, 'initramfs')
-    with open(grub_path, 'w') as stream:
-        stream.write(
-            GRUB_CONF.format(
-                grub_root=grub_root,
-                vmlinuz=vmlinuz,
-                initrd=initrd,
-                root_uuid=root_info['UUID'],
-                extra_opts=extra_opts) + '\n')
-
-
-def get_extra_kernel_parameters():
-    """Extracts the extra kernel commands from /proc/cmdline
-    that should be placed onto the host.
-
-    Any command following the '--' entry should be placed
-    onto the host.
-    """
-    cmdline = read_file('/proc/cmdline')
-    cmdline = cmdline.split()
-    if '--' not in cmdline:
-        return []
-    idx = cmdline.index('--') + 1
-    if idx >= len(cmdline) + 1:
-        return []
-    return strip_kernel_params(
-        cmdline[idx:],
-        strip_params=['initrd=', 'BOOT_IMAGE=', 'BOOTIF='])
-
-
-def get_grub_root(target):
-    """Extracts the grub root (hdX,X) from the grub command.
-
-    This is used so the correct root device is used to install
-    stage1/stage2 boot loader.
-
-    Note: grub-install normally does all of this for you, but
-    since the grub is older, it has an issue with the ISCSI
-    target as /dev/sda and cannot enumarate it with the BIOS.
-    """
-    with util.RunInChroot(target) as in_chroot:
-        data = '\n'.join([
-            'find /boot/grub/stage1',
-            'quit',
-            ])
-        out, err = in_chroot(['grub', '--batch'],
-            data=data, capture=True)
-        regex = re.search('^\s+(\(.+?\))$', out, re.MULTILINE)
-        return regex.groups()[0]
-
-
-def grub_install(target, root):
-    """Installs grub onto the root."""
-    root_dev = root.split(',')[0] + ')'
-    with util.RunInChroot(target) as in_chroot:
-        data = '\n'.join([
-            'root %s' % root,
-            'setup %s' % root_dev,
-            'quit',
-            ])
-        in_chroot(['grub', '--batch'],
-            data=data)
-
-
-def set_autorelabel(target):
-    """Creates file /.autorelabel.
-
-    This is used by SELinux to relabel all of the
-    files on the filesystem to have the correct
-    security context. Without this SSH login will
-    fail.
-    """
-    path = os.path.join(target, '.autorelabel')
-    open(path, 'a').close()
-
-
-def get_boot_mac():
-    """Return the mac address of the booting interface."""
-    cmdline = read_file('/proc/cmdline')
-    cmdline = cmdline.split()
-    try:
-        bootif = [
-            option
-            for option in cmdline
-            if option.startswith('BOOTIF')
-            ][0]
-    except IndexError:
-        return None
-    _, mac = bootif.split('=')
-    mac = mac.split('-')[1:]
-    return ':'.join(mac)
-
-
-def get_interface_names():
-    """Return a dictionary mapping mac addresses to interface names."""
-    sys_path = "/sys/class/net"
-    ifaces = {}
-    for iname in os.listdir(sys_path):
-        mac = read_file(os.path.join(sys_path, iname, "address"))
-        mac = mac.strip().lower()
-        ifaces[mac] = iname
-    return ifaces
-
-
-def get_ipv4_config(iface, data):
-    """Returns the contents of the interface file for ipv4."""
-    config = [
-        'TYPE="Ethernet"',
-        'NM_CONTROLLED="no"',
-        'USERCTL="yes"',
-        ]
-    if 'hwaddress' in data:
-        config.append('HWADDR="%s"' % data['hwaddress'])
-    else:
-        # Last ditch effort, use the device name, it probably won't match though!
-        config.append('DEVICE="%s"' % iface)
-    if data['auto']:
-        config.append('ONBOOT="yes"')
-    else:
-        config.append('ONBOOT="no"')
-
-    method = data['method']
-    if method == 'dhcp':
-        config.append('BOOTPROTO="dhcp"')
-        config.append('PEERDNS="yes"')
-        config.append('PERSISTENT_DHCLIENT="1"')
-        if 'hostname' in data:
-            config.append('DHCP_HOSTNAME="%s"' % data['hostname'])
-    elif method == 'static':
-        config.append('BOOTPROTO="none"')
-        config.append('IPADDR="%s"' % data['address'])
-        config.append('NETMASK="%s"' % data['netmask'])
-        if 'broadcast' in data:
-            config.append('BROADCAST="%s"' % data['broadcast'])
-        if 'gateway' in data:
-            config.append('GATEWAY="%s"' % data['gateway'])
-    elif method == 'manual':
-        config.append('BOOTPROTO="none"')
-    return '\n'.join(config)
-
-
-def write_interface_config(target, iface, data):
-    """Writes config for interface."""
-    family = data['family']
-    if family != "inet":
-        # Only supporting ipv4 currently
-        print(
-            "WARN: unsupported family %s, "
-            "failed to configure interface: %s" (family, iface))
-        return
-    config = get_ipv4_config(iface, data)
-    path = os.path.join(
-        target, 'etc', 'sysconfig', 'network-scripts', 'ifcfg-%s' % iface)
-    with open(path, 'w') as stream:
-        stream.write(config + '\n')
-
-
-def write_network_config(target, mac):
-    """Write network configuration for the given MAC address."""
-    inames = get_interface_names()
-    iname = inames[mac.lower()]
-    write_interface_config(
-        target, iname, {
-            'family': 'inet',
-            'hwaddress': mac.upper(),
-            'auto': True,
-            'method': 'dhcp'
-        })
-
-
-def main():
-    state = util.load_command_environment()
-    target = state['target']
-    if target is None:
-        print("Target was not provided in the environment.")
-        sys.exit(1)
-    fstab = state['fstab']
-    if fstab is None:
-        print("/etc/fstab output was not provided in the environment.")
-        sys.exit(1)
-    bootmac = get_boot_mac()
-    if bootmac is None:
-        print("Unable to determine boot interface.")
-        sys.exit(1)
-    devices = get_block_devices(target)
-    if not devices:
-        print("Unable to find block device for: %s" % target)
-        sys.exit(1)
-
-    write_fstab(target, fstab)
-
-    grub_root = get_grub_root(target)
-    write_grub_conf(target, grub_root, extra=get_extra_kernel_parameters())
-    grub_install(target, grub_root)
-
-    set_autorelabel(target)
-    write_network_config(target, bootmac)
-
-
-if __name__ == "__main__":
-    main()

=== target is u'python_wrapper'
=== added file 'contrib/centos/centos6/curtin/curtin-hooks.py'
--- contrib/centos/centos6/curtin/curtin-hooks.py	1970-01-01 00:00:00 +0000
+++ contrib/centos/centos6/curtin/curtin-hooks.py	2017-06-13 16:13:40 +0000
@@ -0,0 +1,342 @@
+#!/usr/bin/env python
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+import codecs
+import os
+import re
+import sys
+
+from curtin import (
+    block,
+    util,
+    )
+
+"""
+CentOS 6
+
+Currently Support:
+
+- Legacy boot
+- DHCP of BOOTIF
+
+Not Supported:
+
+- UEFI boot (*Bad support, most likely wont support)
+- Multiple network configration
+- IPv6
+"""
+
+FSTAB_PREPEND = """\
+#
+# /etc/fstab
+# Created by MAAS fast-path installer.
+#
+# Accessible filesystems, by reference, are maintained under '/dev/disk'
+# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
+#
+"""
+
+FSTAB_APPEND = """\
+tmpfs                   /dev/shm                tmpfs   defaults        0 0
+devpts                  /dev/pts                devpts  gid=5,mode=620  0 0
+sysfs                   /sys                    sysfs   defaults        0 0
+proc                    /proc                   proc    defaults        0 0
+"""
+
+GRUB_CONF = """\
+#
+# /boot/grub/grub.conf
+# Created by MAAS fast-path installer.
+#
+default 0
+timeout 0
+title MAAS
+ root {grub_root}
+ kernel /boot/{vmlinuz} root=UUID={root_uuid} {extra_opts}
+ initrd /boot/{initrd}
+"""
+
+
+def get_block_devices(target):
+    """Returns list of block devices for the given target."""
+    devs = block.get_devices_for_mp(target)
+    blockdevs = set()
+    for maybepart in devs:
+        (blockdev, part) = block.get_blockdev_for_partition(maybepart)
+        blockdevs.add(blockdev)
+    return list(blockdevs)
+
+
+def get_root_info(target):
+    """Returns the root partitions information."""
+    rootpath = block.get_devices_for_mp(target)[0]
+    rootdev = os.path.basename(rootpath)
+    blocks = block._lsblock()
+    return blocks[rootdev]
+
+
+def read_file(path):
+    """Returns content of a file."""
+    with codecs.open(path, encoding='utf-8') as stream:
+        return stream.read()
+
+
+def write_fstab(target, curtin_fstab):
+    """Writes the new fstab, using the fstab provided
+    from curtin."""
+    fstab_path = os.path.join(target, 'etc', 'fstab')
+    fstab_data = read_file(curtin_fstab)
+    with open(fstab_path, 'w') as stream:
+        stream.write(FSTAB_PREPEND)
+        stream.write(fstab_data)
+        stream.write(FSTAB_APPEND)
+
+
+def extract_kernel_params(data):
+    """Extracts the kernel parametes from the provided
+    grub config data."""
+    match = re.search('^\s+kernel (.+?)$', data, re.MULTILINE)
+    return match.group(0)
+
+
+def strip_kernel_params(params, strip_params=[]):
+    """Removes un-needed kernel parameters."""
+    new_params = []
+    for param in params:
+        remove = False
+        for strip in strip_params:
+            if param.startswith(strip):
+                remove = True
+                break
+        if remove is False:
+            new_params.append(param)
+    return new_params
+
+
+def get_boot_file(target, filename):
+    """Return the full filename of file in /boot on target."""
+    boot_dir = os.path.join(target, 'boot')
+    files = [
+        fname
+        for fname in os.listdir(boot_dir)
+        if fname.startswith(filename)
+        ]
+    if not files:
+        return None
+    return files[0]
+
+
+def write_grub_conf(target, grub_root, extra=[]):
+    """Writes a new /boot/grub/grub.conf with the correct
+    boot arguments."""
+    root_info = get_root_info(target)
+    grub_path = os.path.join(target, 'boot', 'grub', 'grub.conf')
+    extra_opts = ' '.join(extra)
+    vmlinuz = get_boot_file(target, 'vmlinuz')
+    initrd = get_boot_file(target, 'initramfs')
+    with open(grub_path, 'w') as stream:
+        stream.write(
+            GRUB_CONF.format(
+                grub_root=grub_root,
+                vmlinuz=vmlinuz,
+                initrd=initrd,
+                root_uuid=root_info['UUID'],
+                extra_opts=extra_opts) + '\n')
+
+
+def get_extra_kernel_parameters():
+    """Extracts the extra kernel commands from /proc/cmdline
+    that should be placed onto the host.
+
+    Any command following the '--' entry should be placed
+    onto the host.
+    """
+    cmdline = read_file('/proc/cmdline')
+    cmdline = cmdline.split()
+    if '--' not in cmdline:
+        return []
+    idx = cmdline.index('--') + 1
+    if idx >= len(cmdline) + 1:
+        return []
+    return strip_kernel_params(
+        cmdline[idx:],
+        strip_params=['initrd=', 'BOOT_IMAGE=', 'BOOTIF='])
+
+
+def get_grub_root(target):
+    """Extracts the grub root (hdX,X) from the grub command.
+
+    This is used so the correct root device is used to install
+    stage1/stage2 boot loader.
+
+    Note: grub-install normally does all of this for you, but
+    since the grub is older, it has an issue with the ISCSI
+    target as /dev/sda and cannot enumarate it with the BIOS.
+    """
+    with util.RunInChroot(target) as in_chroot:
+        data = '\n'.join([
+            'find /boot/grub/stage1',
+            'quit',
+            ]).encode('utf-8')
+        out, err = in_chroot(['grub', '--batch'],
+                             data=data, capture=True)
+        regex = re.search('^\s+(\(.+?\))$', out, re.MULTILINE)
+        return regex.groups()[0]
+
+
+def grub_install(target, root):
+    """Installs grub onto the root."""
+    root_dev = root.split(',')[0] + ')'
+    with util.RunInChroot(target) as in_chroot:
+        data = '\n'.join([
+            'root %s' % root,
+            'setup %s' % root_dev,
+            'quit',
+            ]).encode('utf-8')
+        in_chroot(['grub', '--batch'],
+                  data=data)
+
+
+def set_autorelabel(target):
+    """Creates file /.autorelabel.
+
+    This is used by SELinux to relabel all of the
+    files on the filesystem to have the correct
+    security context. Without this SSH login will
+    fail.
+    """
+    path = os.path.join(target, '.autorelabel')
+    open(path, 'a').close()
+
+
+def get_boot_mac():
+    """Return the mac address of the booting interface."""
+    cmdline = read_file('/proc/cmdline')
+    cmdline = cmdline.split()
+    try:
+        bootif = [
+            option
+            for option in cmdline
+            if option.startswith('BOOTIF')
+            ][0]
+    except IndexError:
+        return None
+    _, mac = bootif.split('=')
+    mac = mac.split('-')[1:]
+    return ':'.join(mac)
+
+
+def get_interface_names():
+    """Return a dictionary mapping mac addresses to interface names."""
+    sys_path = "/sys/class/net"
+    ifaces = {}
+    for iname in os.listdir(sys_path):
+        mac = read_file(os.path.join(sys_path, iname, "address"))
+        mac = mac.strip().lower()
+        ifaces[mac] = iname
+    return ifaces
+
+
+def get_ipv4_config(iface, data):
+    """Returns the contents of the interface file for ipv4."""
+    config = [
+        'TYPE="Ethernet"',
+        'NM_CONTROLLED="no"',
+        'USERCTL="yes"',
+        ]
+    if 'hwaddress' in data:
+        config.append('HWADDR="%s"' % data['hwaddress'])
+    else:
+        # Last ditch effort, use the device name, it probably won't match
+        # though!
+        config.append('DEVICE="%s"' % iface)
+    if data['auto']:
+        config.append('ONBOOT="yes"')
+    else:
+        config.append('ONBOOT="no"')
+
+    method = data['method']
+    if method == 'dhcp':
+        config.append('BOOTPROTO="dhcp"')
+        config.append('PEERDNS="yes"')
+        config.append('PERSISTENT_DHCLIENT="1"')
+        if 'hostname' in data:
+            config.append('DHCP_HOSTNAME="%s"' % data['hostname'])
+    elif method == 'static':
+        config.append('BOOTPROTO="none"')
+        config.append('IPADDR="%s"' % data['address'])
+        config.append('NETMASK="%s"' % data['netmask'])
+        if 'broadcast' in data:
+            config.append('BROADCAST="%s"' % data['broadcast'])
+        if 'gateway' in data:
+            config.append('GATEWAY="%s"' % data['gateway'])
+    elif method == 'manual':
+        config.append('BOOTPROTO="none"')
+    return '\n'.join(config)
+
+
+def write_interface_config(target, iface, data):
+    """Writes config for interface."""
+    family = data['family']
+    if family != "inet":
+        # Only supporting ipv4 currently
+        print(
+            "WARN: unsupported family %s, "
+            "failed to configure interface: %s" (family, iface))
+        return
+    config = get_ipv4_config(iface, data)
+    path = os.path.join(
+        target, 'etc', 'sysconfig', 'network-scripts', 'ifcfg-%s' % iface)
+    with open(path, 'w') as stream:
+        stream.write(config + '\n')
+
+
+def write_network_config(target, mac):
+    """Write network configuration for the given MAC address."""
+    inames = get_interface_names()
+    iname = inames[mac.lower()]
+    write_interface_config(
+        target, iname, {
+            'family': 'inet',
+            'hwaddress': mac.upper(),
+            'auto': True,
+            'method': 'dhcp'
+        })
+
+
+def main():
+    state = util.load_command_environment()
+    target = state['target']
+    if target is None:
+        print("Target was not provided in the environment.")
+        sys.exit(1)
+    fstab = state['fstab']
+    if fstab is None:
+        print("/etc/fstab output was not provided in the environment.")
+        sys.exit(1)
+    bootmac = get_boot_mac()
+    if bootmac is None:
+        print("Unable to determine boot interface.")
+        sys.exit(1)
+    devices = get_block_devices(target)
+    if not devices:
+        print("Unable to find block device for: %s" % target)
+        sys.exit(1)
+
+    write_fstab(target, fstab)
+
+    grub_root = get_grub_root(target)
+    write_grub_conf(target, grub_root, extra=get_extra_kernel_parameters())
+    grub_install(target, grub_root)
+
+    set_autorelabel(target)
+    write_network_config(target, bootmac)
+
+
+if __name__ == "__main__":
+    main()

=== modified file 'contrib/centos/centos6/curtin/finalize'
--- contrib/centos/centos6/curtin/finalize	2015-02-05 13:50:16 +0000
+++ contrib/centos/centos6/curtin/finalize	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-import json
-import os
-import sys
-
-sys.path.append('/curtin')
-from curtin import util
-
-
-DATASOURCE_LIST = """\
-datasource_list: [ MAAS ]
-"""
-
-DATASOURCE = """\
-datasource:
-  MAAS: {{consumer_key: {consumer_key}, metadata_url: '{url}',
-    token_key: {token_key}, token_secret: {token_secret}}}
-"""
-
-
-def get_datasource(**kwargs):
-    """Returns the format cloud-init datasource."""
-    return DATASOURCE_LIST + DATASOURCE.format(**kwargs)
-
-
-def load_config(path):
-    """Loads the curtin config."""
-    with open(path, 'r') as stream:
-        return json.load(stream)
-
-
-def extract_maas_parameters(config):
-    """Extracts the needed values from the debconf
-    entry."""
-    params = {}
-    for line in config.splitlines():
-        cloud, key, type, value = line.split()[:4]
-        if key == "cloud-init/maas-metadata-url":
-            params['url'] = value
-        elif key == "cloud-init/maas-metadata-credentials":
-            values = value.split("&")
-            for oauth in values:
-                key, value = oauth.split('=')
-                if key == 'oauth_token_key':
-                    params['token_key'] = value
-                elif key == 'oauth_token_secret':
-                    params['token_secret'] = value
-                elif key == 'oauth_consumer_key':
-                    params['consumer_key'] = value
-    return params
-                 
-
-def get_maas_debconf_selections(config):
-    """Gets the debconf selections from the curtin config."""
-    try:
-        return config['debconf_selections']['maas']
-    except KeyError:
-        return None
-
-
-def write_datasource(target, data):
-    """Writes the cloudinit config into
-    /etc/cloud/cloud.cfg.d/90_datasource.cfg."""
-    path = os.path.join(
-        target, 'etc', 'cloud', 'cloud.cfg.d', '90_datasource.cfg')
-    with open(path, 'w') as stream:
-        stream.write(data + '\n')
-
-
-def main():
-    state = util.load_command_environment()
-    target = state['target']
-    if target is None:
-        print("Target was not provided in the environment.")
-        sys.exit(1)
-    config_f = state['config']
-    if config_f is None:
-        print("Config was not provided in the environment.")
-        sys.exit(1)
-    config = load_config(config_f)
-    
-    debconf = get_maas_debconf_selections(config)
-    if debconf is None:
-        print("Failed to get the debconf_selections.")
-        sys.exit(1)
-
-    params = extract_maas_parameters(debconf)
-    datasource = get_datasource(**params)
-    write_datasource(target, datasource)
-
-
-if __name__ == "__main__":
-    main()

=== target is u'python_wrapper'
=== added file 'contrib/centos/centos6/curtin/finalize.py'
--- contrib/centos/centos6/curtin/finalize.py	1970-01-01 00:00:00 +0000
+++ contrib/centos/centos6/curtin/finalize.py	2017-06-13 16:13:40 +0000
@@ -0,0 +1,99 @@
+#!/usr/bin/env python
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+import json
+import os
+import sys
+
+from curtin import util
+
+
+DATASOURCE_LIST = """\
+datasource_list: [ MAAS ]
+"""
+
+DATASOURCE = """\
+datasource:
+  MAAS: {{consumer_key: {consumer_key}, metadata_url: '{url}',
+    token_key: {token_key}, token_secret: {token_secret}}}
+"""
+
+
+def get_datasource(**kwargs):
+    """Returns the format cloud-init datasource."""
+    return DATASOURCE_LIST + DATASOURCE.format(**kwargs)
+
+
+def load_config(path):
+    """Loads the curtin config."""
+    with open(path, 'r') as stream:
+        return json.load(stream)
+
+
+def extract_maas_parameters(config):
+    """Extracts the needed values from the debconf
+    entry."""
+    params = {}
+    for line in config.splitlines():
+        cloud, key, type, value = line.split()[:4]
+        if key == "cloud-init/maas-metadata-url":
+            params['url'] = value
+        elif key == "cloud-init/maas-metadata-credentials":
+            values = value.split("&")
+            for oauth in values:
+                key, value = oauth.split('=')
+                if key == 'oauth_token_key':
+                    params['token_key'] = value
+                elif key == 'oauth_token_secret':
+                    params['token_secret'] = value
+                elif key == 'oauth_consumer_key':
+                    params['consumer_key'] = value
+    return params
+
+
+def get_maas_debconf_selections(config):
+    """Gets the debconf selections from the curtin config."""
+    try:
+        return config['debconf_selections']['maas']
+    except KeyError:
+        return None
+
+
+def write_datasource(target, data):
+    """Writes the cloudinit config into
+    /etc/cloud/cloud.cfg.d/90_datasource.cfg."""
+    path = os.path.join(
+        target, 'etc', 'cloud', 'cloud.cfg.d', '90_datasource.cfg')
+    with open(path, 'w') as stream:
+        stream.write(data + '\n')
+
+
+def main():
+    state = util.load_command_environment()
+    target = state['target']
+    if target is None:
+        print("Target was not provided in the environment.")
+        sys.exit(1)
+    config_f = state['config']
+    if config_f is None:
+        print("Config was not provided in the environment.")
+        sys.exit(1)
+    config = load_config(config_f)
+
+    debconf = get_maas_debconf_selections(config)
+    if debconf is None:
+        print("Failed to get the debconf_selections.")
+        sys.exit(1)
+
+    params = extract_maas_parameters(debconf)
+    datasource = get_datasource(**params)
+    write_datasource(target, datasource)
+
+
+if __name__ == "__main__":
+    main()

=== added file 'contrib/centos/centos6/curtin/python_wrapper'
--- contrib/centos/centos6/curtin/python_wrapper	1970-01-01 00:00:00 +0000
+++ contrib/centos/centos6/curtin/python_wrapper	2017-06-13 16:13:40 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export PYTHONPATH='/curtin'
+
+# Ubuntu 16.04 only ships with Python 3 while previous versions only ship
+# with Python 2.
+if type -p python > /dev/null; then
+    exec python "$0.py" "$@"
+else
+    exec python3 "$0.py" "$@"
+fi

=== modified file 'contrib/centos/centos7/centos7-amd64.ks'
--- contrib/centos/centos7/centos7-amd64.ks	2015-07-23 20:03:39 +0000
+++ contrib/centos/centos7/centos7-amd64.ks	2017-06-13 16:13:40 +0000
@@ -1,103 +1,126 @@
-#version=RHEL7
+#version=CentOS7
 install
+# Poweroff after installation
+poweroff
+# System authorization information
+auth --enableshadow --passalgo=sha512
 # Firewall configuration
 firewall --enabled --service=ssh
-repo --name="repo0" --baseurl=http://mirror.centos.org/centos/7/os/x86_64
-repo --name="repo1" --baseurl=http://mirror.centos.org/centos/7/updates/x86_64
-repo --name="repo2" --baseurl=http://dl.fedoraproject.org/pub/epel/7/x86_64/
-repo --name="repo3" --baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Everything/x86_64/os/ --includepkgs=python-oauth
-# Root password
-rootpw --iscrypted $6$c78cFcbEdD2FcfE1$W0v5nUb1j1T8E3szv01CoBWFnl1TEWpt43WSZqtVP5kNih6zLiixQWS1umh1bDGnzWIqkwCwjIR8lHr.W0ua21 
-# System authorization information
-auth --useshadow --enablemd5
-# System keyboard
-keyboard us
+firstboot --disable
+ignoredisk --only-use=vda
+# Keyboard layouts
+# old format: keyboard us
+# new format:
+keyboard --vckeymap=us --xlayouts='us'
 # System language
 lang en_US.UTF-8
-# SELinux configuration
-selinux --enforcing
-# Installation logging level
-logging --level=info
-# Poweroff after installation
-poweroff
-# System services
-services --disabled="avahi-daemon,iscsi,iscsid,firstboot,kdump" --enabled="network,sshd,rsyslog,tuned,chronyd"
-# System timezone
-timezone --isUtc America/New_York
+repo --name "os" --baseurl="http://mirror.centos.org/centos/7/os/x86_64"
+repo --name "updates" --baseurl="http://mirror.centos.org/centos/7/updates/x86_64"
+repo --name "extras" --baseurl="http://mirror.centos.org/centos/7/extras/x86_64"
+repo --name="python-oauth" --baseurl="http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Everything/x86_64/os/" --includepkgs=python-oauth
 # Network information
 network  --bootproto=dhcp --device=eth0 --onboot=on
 # System bootloader configuration
-bootloader --append="console=ttyS0,115200n8 console=tty0" --location=mbr --driveorder="sda" --timeout=1
-# Clear the Master Boot Record
+bootloader --append="console=ttyS0,115200n8 console=tty0" --location=mbr --driveorder="vda" --timeout=1
+# Root password
+rootpw --iscrypted nothing
+selinux --enforcing
+services --disabled="kdump" --enabled="network,sshd,rsyslog,chronyd"
+timezone UTC --isUtc
+# Disk
 zerombr
-# Partition clearing information
-clearpart --all
-# Disk partitioning information
+clearpart --all --initlabel 
 part / --fstype="ext4" --size=3072
 
-%post
+%post --erroronfail
+
+# workaround anaconda requirements
+passwd -d root
+passwd -l root
+
+# remove avahi and networkmanager
+echo "Removing avahi/zeroconf and NetworkManager"
+yum -C -y remove avahi\* Network\*
 
 # make sure firstboot doesn't start
 echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
 
-cat <<EOL >> /etc/rc.local
-if [ ! -d /root/.ssh ] ; then
-    mkdir -p /root/.ssh
-    chmod 0700 /root/.ssh
-    restorecon /root/.ssh
-fi
-EOL
-
-cat <<EOL >> /etc/ssh/sshd_config
-UseDNS no
-PermitRootLogin without-password
-EOL
-
-# bz705572
-ln -s /boot/grub/grub.conf /etc/grub.conf
-
-# bz688608
-sed -i 's|\(^PasswordAuthentication \)yes|\1no|' /etc/ssh/sshd_config
-
-# allow sudo powers to cloud-user
-echo -e 'cloud-user\tALL=(ALL)\tNOPASSWD: ALL' >> /etc/sudoers
-
-#setup getty on ttyS0
-echo "ttyS0" >> /etc/securetty
-cat <<EOF > /etc/init/ttyS0.conf
-start on stopped rc RUNLEVEL=[2345]
-stop on starting runlevel [016]
-respawn
-instance /dev/ttyS0
-exec /sbin/agetty /dev/ttyS0 115200 vt100-nav
+echo "Cleaning old yum repodata."
+yum clean all
+
+# chance dhcp client retry/timeouts to resolve #6866
+cat  >> /etc/dhcp/dhclient.conf << EOF
+
+timeout 300;
+retry 60;
 EOF
 
-# lock root password
-passwd -d root
-passwd -l root
-
-# fix the cloud-init config, so its for rhel and not for fedora
-sed -i 's/name: fedora/name: cloud-user/g' /etc/cloud/cloud.cfg
-sed -i 's/gecos: Fedora Cloud User/gecos: CentOS Cloud User/g' /etc/cloud/cloud.cfg
-
-# delete the eth0 config
-rm -rf /etc/sysconfig/network-scripts/ifcfg-eth0
-
 # clean up installation logs"
-yum clean all
 rm -rf /var/log/yum.log
 rm -rf /var/lib/yum/*
 rm -rf /root/install.log
 rm -rf /root/install.log.syslog
 rm -rf /root/anaconda-ks.cfg
 rm -rf /var/log/anaconda*
+rm -rf /root/anac*
+
+echo "Fixing SELinux contexts."
+touch /var/log/cron
+touch /var/log/boot.log
+mkdir -p /var/cache/yum
+/usr/sbin/fixfiles -R -a restore
+
+# reorder console entries
+sed -i 's/console=tty0/console=tty0 console=ttyS0,115200n8/' /boot/grub2/grub.cfg
+
 %end
 
 %packages
 @core
+chrony
 cloud-init
+cloud-utils-growpart
+dracut-config-generic
+dracut-norescue
+efibootmgr
+firewalld
+grub2
+grub2-efi-modules
+kernel
+rsync
+tar
+yum-utils
 python-oauth
-# Don't install NetworkManager
 -NetworkManager
+-aic94xx-firmware
+-alsa-firmware
+-alsa-lib
+-alsa-tools-firmware
+-iprutils
+-ivtv-firmware
+-iwl100-firmware
+-iwl1000-firmware
+-iwl105-firmware
+-iwl135-firmware
+-iwl2000-firmware
+-iwl2030-firmware
+-iwl3160-firmware
+-iwl3945-firmware
+-iwl4965-firmware
+-iwl5000-firmware
+-iwl5150-firmware
+-iwl6000-firmware
+-iwl6000g2a-firmware
+-iwl6000g2b-firmware
+-iwl6050-firmware
+-iwl7260-firmware
+-iwl7265-firmware
+-libertas-sd8686-firmware
+-libertas-sd8787-firmware
+-libertas-usb8388-firmware
+-plymouth
+-postfix
+-wpa_supplicant
 
 %end
+

=== modified file 'contrib/centos/centos7/curtin/curtin-hooks'
--- contrib/centos/centos7/curtin/curtin-hooks	2015-07-23 20:03:39 +0000
+++ contrib/centos/centos7/curtin/curtin-hooks	1970-01-01 00:00:00 +0000
@@ -1,333 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-import os
-import re
-import sys
-import shutil
-
-sys.path.append('/curtin')
-from curtin import (
-    block,
-    net,
-    util,
-    )
-
-"""
-CentOS 7
-
-Currently Support:
-
-- Legacy boot
-- UEFI boot
-- DHCP of BOOTIF
-
-Not Supported:
-
-- Multiple network configration
-- IPv6
-"""
-
-FSTAB_PREPEND = """\
-#
-# /etc/fstab
-# Created by MAAS fast-path installer.
-#
-# Accessible filesystems, by reference, are maintained under '/dev/disk'
-# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
-#
-"""
-
-FSTAB_UEFI = """\
-LABEL=uefi-boot /boot/efi vfat defaults 0 0
-"""
-
-GRUB_PREPEND = """\
-# Set by MAAS fast-path installer.
-GRUB_TIMEOUT=0
-GRUB_TERMINAL_OUTPUT=console
-GRUB_DISABLE_OS_PROBER=true
-"""
-
-
-def get_block_devices(target):
-    """Returns list of block devices for the given target."""
-    devs = block.get_devices_for_mp(target)
-    blockdevs = set()
-    for maybepart in devs:
-        (blockdev, part) = block.get_blockdev_for_partition(maybepart)
-        blockdevs.add(blockdev)
-    return list(blockdevs)
-
-
-def get_root_info(target):
-    """Returns the root partitions information."""
-    rootpath = block.get_devices_for_mp(target)[0]
-    rootdev = os.path.basename(rootpath)
-    blocks = block._lsblock()
-    return blocks[rootdev]
-
-
-def get_uefi_partition():
-    """Return the UEFI partition."""
-    for _, value in block._lsblock().items():
-        if value['LABEL'] == 'uefi-boot':
-            return value
-    return None
-
-
-def read_file(path):
-    """Returns content of a file."""
-    with open(path, 'rb') as stream:
-        return stream.read().encode('utf-8')
-
-
-def write_fstab(target, curtin_fstab):
-    """Writes the new fstab, using the fstab provided
-    from curtin."""
-    fstab_path = os.path.join(target, 'etc', 'fstab')
-    fstab_data = read_file(curtin_fstab)
-    with open(fstab_path, 'w') as stream:
-        stream.write(FSTAB_PREPEND)
-        stream.write(fstab_data)
-        if util.is_uefi_bootable():
-            stream.write(FSTAB_UEFI)
-
-
-def strip_kernel_params(params, strip_params=[]):
-    """Removes un-needed kernel parameters."""
-    new_params = []
-    for param in params:
-        remove = False
-        for strip in strip_params:
-             if param.startswith(strip):
-                 remove = True
-                 break
-        if remove is False:
-            new_params.append(param)
-    return new_params
-
-
-def get_extra_kernel_parameters():
-    """Extracts the extra kernel commands from /proc/cmdline
-    that should be placed onto the host.
-
-    Any command following the '--' entry should be placed
-    onto the host.
-    """
-    cmdline = read_file('/proc/cmdline')
-    cmdline = cmdline.split()
-    if '--' not in cmdline:
-        return []
-    idx = cmdline.index('--') + 1
-    if idx >= len(cmdline) + 1:
-        return []
-    return strip_kernel_params(
-        cmdline[idx:],
-        strip_params=['initrd=', 'BOOT_IMAGE=', 'BOOTIF='])
-
-
-def update_grub_default(target, extra=[]):
-    """Updates /etc/default/grub with the correct options."""
-    grub_default_path = os.path.join(target, 'etc', 'default', 'grub')
-    kernel_cmdline = ' '.join(extra)
-    with open(grub_default_path, 'a') as stream:
-        stream.write(GRUB_PREPEND)
-        stream.write('GRUB_CMDLINE_LINUX=\"%s\"\n' % kernel_cmdline)
-
-
-def grub2_install(target, root):
-    """Installs grub2 to the root."""
-    with util.RunInChroot(target) as in_chroot:
-        in_chroot(['grub2-install', '--recheck', root])
-
-
-def grub2_mkconfig(target):
-    """Writes the new grub2 config."""
-    with util.RunInChroot(target) as in_chroot:
-        in_chroot(['grub2-mkconfig', '-o', '/boot/grub2/grub.cfg'])
-
-
-def install_efi(target, uefi_path):
-    """Install the EFI data from /boot into efi partition."""
-    # Create temp mount point for uefi partition.
-    tmp_efi = os.path.join(target, 'boot', 'efi_part')
-    os.mkdir(tmp_efi)
-    util.subp(['mount', uefi_path, tmp_efi])
-
-    # Copy the data over.
-    try:
-        efi_path = os.path.join(target, 'boot', 'efi')
-        if os.path.exists(os.path.join(tmp_efi, 'EFI')):
-            shutil.rmtree(os.path.join(tmp_efi, 'EFI'))
-        shutil.copytree(
-            os.path.join(efi_path, 'EFI'),
-            os.path.join(tmp_efi, 'EFI'))
-    finally:
-        # Clean up tmp mount
-        util.subp(['umount', tmp_efi])
-        os.rmdir(tmp_efi)
-
-    # Mount and do grub install
-    util.subp(['mount', uefi_path, efi_path])
-    try:
-        with util.RunInChroot(target) as in_chroot:
-            in_chroot([
-                'grub2-install', '--target=x86_64-efi',
-                '--efi-directory', '/boot/efi',
-                '--recheck'])
-    finally:
-        util.subp(['umount', efi_path])
-
-
-def set_autorelabel(target):
-    """Creates file /.autorelabel.
-
-    This is used by SELinux to relabel all of the
-    files on the filesystem to have the correct
-    security context. Without this SSH login will
-    fail.
-    """
-    path = os.path.join(target, '.autorelabel')
-    open(path, 'a').close()
-
-
-def get_boot_mac():
-    """Return the mac address of the booting interface."""
-    cmdline = read_file('/proc/cmdline')
-    cmdline = cmdline.split()
-    try:
-        bootif = [
-            option
-            for option in cmdline
-            if option.startswith('BOOTIF')
-            ][0]
-    except IndexError:
-        return None
-    _, mac = bootif.split('=')
-    mac = mac.split('-')[1:]
-    return ':'.join(mac)
-
-
-def get_interface_names():
-    """Return a dictionary mapping mac addresses to interface names."""
-    sys_path = "/sys/class/net"
-    ifaces = {}
-    for iname in os.listdir(sys_path):
-        mac = read_file(os.path.join(sys_path, iname, "address"))
-        mac = mac.strip().lower()
-        ifaces[mac] = iname
-    return ifaces
-
-
-def get_ipv4_config(iface, data):
-    """Returns the contents of the interface file for ipv4."""
-    config = [
-        'TYPE="Ethernet"',
-        'NM_CONTROLLED="no"',
-        'USERCTL="yes"',
-        ]
-    if 'hwaddress' in data:
-        config.append('HWADDR="%s"' % data['hwaddress'])
-    # Fallback to using device name
-    else:
-        config.append('DEVICE="%"' % iface)
-    if data['auto']:
-        config.append('ONBOOT="yes"')
-    else:
-        config.append('ONBOOT="no"')
-
-    method = data['method']
-    if method == 'dhcp':
-        config.append('BOOTPROTO="dhcp"')
-        config.append('PEERDNS="yes"')
-        config.append('PERSISTENT_DHCLIENT="1"')
-        if 'hostname' in data:
-            config.append('DHCP_HOSTNAME="%s"' % data['hostname'])
-    elif method == 'static':
-        config.append('BOOTPROTO="none"')
-        config.append('IPADDR="%s"' % data['address'])
-        config.append('NETMASK="%s"' % data['netmask'])
-        if 'broadcast' in data:
-            config.append('BROADCAST="%s"' % data['broadcast'])
-        if 'gateway' in data:
-            config.append('GATEWAY="%s"' % data['gateway'])
-    elif method == 'manual':
-        config.append('BOOTPROTO="none"')
-    return '\n'.join(config)
-
-
-def write_interface_config(target, iface, data):
-    """Writes config for interface."""
-    family = data['family']
-    if family != "inet":
-        # Only supporting ipv4 currently
-        print(
-            "WARN: unsupported family %s, "
-            "failed to configure interface: %s" (family, iface))
-        return
-    config = get_ipv4_config(iface, data)
-    path = os.path.join(
-        target, 'etc', 'sysconfig', 'network-scripts', 'ifcfg-%s' % iface)
-    with open(path, 'w') as stream:
-        stream.write(config + '\n')
-
-
-def write_network_config(target, mac):
-    """Write network configuration for the given MAC address."""
-    inames = get_interface_names()
-    iname = inames[mac.lower()]
-    write_interface_config(
-        target, iname, {
-            'family': 'inet',
-            'hwaddress': mac.upper(),
-            'auto': True,
-            'method': 'dhcp'
-        })
-
-
-def main():
-    state = util.load_command_environment()
-    target = state['target']
-    if target is None:
-        print("Target was not provided in the environment.")
-        sys.exit(1)
-    fstab = state['fstab']
-    if fstab is None:
-        print("/etc/fstab output was not provided in the environment.")
-        sys.exit(1)
-    bootmac = get_boot_mac()
-    if bootmac is None:
-        print("Unable to determine boot interface.")
-        sys.exit(1)
-    devices = get_block_devices(target)
-    if not devices:
-        print("Unable to find block device for: %s" % target)
-        sys.exit(1)
-
-    write_fstab(target, fstab)
-
-    update_grub_default(
-        target, extra=get_extra_kernel_parameters())
-    grub2_mkconfig(target)
-    if util.is_uefi_bootable():
-        uefi_part = get_uefi_partition()
-        if uefi_part is None:
-            print('Unable to determine UEFI parition.')
-            sys.exit(1)
-        install_efi(target, uefi_part['device_path'])
-    else:
-        for dev in devices:
-            grub2_install(target, dev)
-
-    set_autorelabel(target)
-    write_network_config(target, bootmac)
-
-
-if __name__ == "__main__":
-    main()

=== target is u'python_wrapper'
=== added file 'contrib/centos/centos7/curtin/curtin-hooks.py'
--- contrib/centos/centos7/curtin/curtin-hooks.py	1970-01-01 00:00:00 +0000
+++ contrib/centos/centos7/curtin/curtin-hooks.py	2017-06-13 16:13:40 +0000
@@ -0,0 +1,338 @@
+#!/usr/bin/env python
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+import os
+import re
+import sys
+import shutil
+
+sys.path.append('/curtin')
+from curtin import (
+    block,
+    net,
+    util,
+    )
+
+"""
+CentOS/RHEL 7
+
+Currently Support:
+
+- Legacy boot
+- UEFI boot
+- DHCP of BOOTIF
+
+Not Supported:
+
+- Multiple network configration
+- IPv6
+"""
+
+FSTAB_PREPEND = """\
+#
+# /etc/fstab
+# Created by MAAS fast-path installer.
+#
+# Accessible filesystems, by reference, are maintained under '/dev/disk'
+# See man pages fstab(5), findfs(8), mount(8) and/or blkid(8) for more info
+#
+"""
+
+FSTAB_UEFI = """\
+LABEL=uefi-boot /boot/efi vfat defaults 0 0
+"""
+
+GRUB_PREPEND = """\
+# Set by MAAS fast-path installer.
+GRUB_TIMEOUT=0
+GRUB_TERMINAL_OUTPUT=console
+GRUB_DISABLE_OS_PROBER=true
+"""
+
+
+def get_block_devices(target):
+    """Returns list of block devices for the given target."""
+    devs = block.get_devices_for_mp(target)
+    blockdevs = set()
+    for maybepart in devs:
+        (blockdev, part) = block.get_blockdev_for_partition(maybepart)
+        blockdevs.add(blockdev)
+    return list(blockdevs)
+
+
+def get_root_info(target):
+    """Returns the root partitions information."""
+    rootpath = block.get_devices_for_mp(target)[0]
+    rootdev = os.path.basename(rootpath)
+    blocks = block._lsblock()
+    return blocks[rootdev]
+
+
+def read_file(path):
+    """Returns content of a file."""
+    with open(path, encoding="utf-8") as stream:
+        return stream.read()
+
+
+def write_fstab(target, curtin_fstab):
+    """Writes the new fstab, using the fstab provided
+    from curtin."""
+    fstab_path = os.path.join(target, 'etc', 'fstab')
+    fstab_data = read_file(curtin_fstab)
+    with open(fstab_path, 'w') as stream:
+        stream.write(FSTAB_PREPEND)
+        stream.write(fstab_data)
+        if util.is_uefi_bootable():
+            stream.write(FSTAB_UEFI)
+
+
+def strip_kernel_params(params, strip_params=[]):
+    """Removes un-needed kernel parameters."""
+    new_params = []
+    for param in params:
+        remove = False
+        for strip in strip_params:
+             if param.startswith(strip):
+                 remove = True
+                 break
+        if remove is False:
+            new_params.append(param)
+    return new_params
+
+
+def get_extra_kernel_parameters():
+    """Extracts the extra kernel commands from /proc/cmdline
+    that should be placed onto the host.
+
+    Any command following the '--' entry should be placed
+    onto the host.
+    """
+    cmdline = read_file('/proc/cmdline')
+    cmdline = cmdline.split()
+    if '--' not in cmdline:
+        return []
+    idx = cmdline.index('--') + 1
+    if idx >= len(cmdline) + 1:
+        return []
+    return strip_kernel_params(
+        cmdline[idx:],
+        strip_params=['initrd=', 'BOOT_IMAGE=', 'BOOTIF='])
+
+
+def update_grub_default(target, extra=[]):
+    """Updates /etc/default/grub with the correct options."""
+    grub_default_path = os.path.join(target, 'etc', 'default', 'grub')
+    kernel_cmdline = ' '.join(extra)
+    with open(grub_default_path, 'a') as stream:
+        stream.write(GRUB_PREPEND)
+        stream.write('GRUB_CMDLINE_LINUX=\"%s\"\n' % kernel_cmdline)
+
+
+def grub2_install(target, root):
+    """Installs grub2 to the root."""
+    with util.RunInChroot(target) as in_chroot:
+        in_chroot(['grub2-install', '--recheck', root])
+
+
+def grub2_mkconfig(target):
+    """Writes the new grub2 config."""
+    with util.RunInChroot(target) as in_chroot:
+        in_chroot(['grub2-mkconfig', '-o', '/boot/grub2/grub.cfg'])
+
+
+def get_efibootmgr_value(output, key):
+    """Parses the `output` from 'efibootmgr' to return value for `key`."""
+    for line in output.splitlines():
+        split = line.split(':')
+        if len(split) == 2:
+            curr_key = split[0].strip()
+            value = split[1].strip()
+            if curr_key == key:
+                return value
+
+
+def get_file_efi_loaders(output):
+    """Parses the `output` from 'efibootmgr' to return all loaders that exist
+    in '\EFI' path."""
+    return re.findall(
+        r"^Boot(?P<hex>[0-9a-fA-F]{4})\*?\s*\S+\s+.*File\(\\EFI.*$",
+        output, re.MULTILINE)
+
+
+def grub2_install_efi(target):
+    """Configure for EFI.
+
+    First capture the currently booted loader (normally a network device),
+    then perform grub installation (adds a new bootloader and adjusts the
+    boot order), finally re-adjust the boot order so that the currently booted
+    loader is set to boot first in the new order.
+    """
+    with util.RunInChroot(target) as in_chroot:
+        stdout, _ = in_chroot(['efibootmgr', '-v'], capture=True)
+        currently_booted = get_efibootmgr_value(stdout, 'BootCurrent')
+        loaders = get_file_efi_loaders(stdout)
+        if currently_booted in loaders:
+            loaders.remove(currently_booted)
+        for loader in loaders:
+            in_chroot(['efibootmgr', '-B', '-b', loader], capture=True)
+        in_chroot([
+            'grub2-install', '--target=x86_64-efi',
+            '--efi-directory', '/boot/efi',
+            '--recheck'])
+        stdout, _ = in_chroot(['efibootmgr'], capture=True)
+        currently_booted = get_efibootmgr_value(stdout, 'BootCurrent')
+        boot_order = get_efibootmgr_value(stdout, 'BootOrder').split(',')
+        if currently_booted in boot_order:
+            boot_order.remove(currently_booted)
+        boot_order = [currently_booted] + boot_order
+        new_boot_order = ','.join(boot_order)
+        in_chroot(['efibootmgr', '-o', new_boot_order])
+
+
+def set_autorelabel(target):
+    """Creates file /.autorelabel.
+
+    This is used by SELinux to relabel all of the
+    files on the filesystem to have the correct
+    security context. Without this SSH login will
+    fail.
+    """
+    path = os.path.join(target, '.autorelabel')
+    open(path, 'a').close()
+
+
+def get_boot_mac():
+    """Return the mac address of the booting interface."""
+    cmdline = read_file('/proc/cmdline')
+    cmdline = cmdline.split()
+    try:
+        bootif = [
+            option
+            for option in cmdline
+            if option.startswith('BOOTIF')
+            ][0]
+    except IndexError:
+        return None
+    _, mac = bootif.split('=')
+    mac = mac.split('-')[1:]
+    return ':'.join(mac)
+
+
+def get_interface_names():
+    """Return a dictionary mapping mac addresses to interface names."""
+    sys_path = "/sys/class/net"
+    ifaces = {}
+    for iname in os.listdir(sys_path):
+        mac = read_file(os.path.join(sys_path, iname, "address"))
+        mac = mac.strip().lower()
+        ifaces[mac] = iname
+    return ifaces
+
+
+def get_ipv4_config(iface, data):
+    """Returns the contents of the interface file for ipv4."""
+    config = [
+        'TYPE="Ethernet"',
+        'NM_CONTROLLED="no"',
+        'USERCTL="yes"',
+        ]
+    if 'hwaddress' in data:
+        config.append('HWADDR="%s"' % data['hwaddress'])
+    # Fallback to using device name
+    else:
+        config.append('DEVICE="%"' % iface)
+    if data['auto']:
+        config.append('ONBOOT="yes"')
+    else:
+        config.append('ONBOOT="no"')
+
+    method = data['method']
+    if method == 'dhcp':
+        config.append('BOOTPROTO="dhcp"')
+        config.append('PEERDNS="yes"')
+        config.append('PERSISTENT_DHCLIENT="1"')
+        if 'hostname' in data:
+            config.append('DHCP_HOSTNAME="%s"' % data['hostname'])
+    elif method == 'static':
+        config.append('BOOTPROTO="none"')
+        config.append('IPADDR="%s"' % data['address'])
+        config.append('NETMASK="%s"' % data['netmask'])
+        if 'broadcast' in data:
+            config.append('BROADCAST="%s"' % data['broadcast'])
+        if 'gateway' in data:
+            config.append('GATEWAY="%s"' % data['gateway'])
+    elif method == 'manual':
+        config.append('BOOTPROTO="none"')
+    return '\n'.join(config)
+
+
+def write_interface_config(target, iface, data):
+    """Writes config for interface."""
+    family = data['family']
+    if family != "inet":
+        # Only supporting ipv4 currently
+        print(
+            "WARN: unsupported family %s, "
+            "failed to configure interface: %s" (family, iface))
+        return
+    config = get_ipv4_config(iface, data)
+    path = os.path.join(
+        target, 'etc', 'sysconfig', 'network-scripts', 'ifcfg-%s' % iface)
+    with open(path, 'w') as stream:
+        stream.write(config + '\n')
+
+
+def write_network_config(target, mac):
+    """Write network configuration for the given MAC address."""
+    inames = get_interface_names()
+    iname = inames[mac.lower()]
+    write_interface_config(
+        target, iname, {
+            'family': 'inet',
+            'hwaddress': mac.upper(),
+            'auto': True,
+            'method': 'dhcp'
+        })
+
+
+def main():
+    state = util.load_command_environment()
+    target = state['target']
+    if target is None:
+        print("Target was not provided in the environment.")
+        sys.exit(1)
+    fstab = state['fstab']
+    if fstab is None:
+        print("/etc/fstab output was not provided in the environment.")
+        sys.exit(1)
+    bootmac = get_boot_mac()
+    if bootmac is None:
+        print("Unable to determine boot interface.")
+        sys.exit(1)
+    devices = get_block_devices(target)
+    if not devices:
+        print("Unable to find block device for: %s" % target)
+        sys.exit(1)
+
+    write_fstab(target, fstab)
+
+    update_grub_default(
+        target, extra=get_extra_kernel_parameters())
+    grub2_mkconfig(target)
+    if util.is_uefi_bootable():
+        grub2_install_efi(target)
+    else:
+        for dev in devices:
+            grub2_install(target, dev)
+
+    set_autorelabel(target)
+    write_network_config(target, bootmac)
+
+
+if __name__ == "__main__":
+    main()

=== modified file 'contrib/centos/centos7/curtin/finalize'
--- contrib/centos/centos7/curtin/finalize	2015-02-05 13:50:16 +0000
+++ contrib/centos/centos7/curtin/finalize	1970-01-01 00:00:00 +0000
@@ -1,100 +0,0 @@
-#!/usr/bin/env python
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-import json
-import os
-import sys
-
-sys.path.append('/curtin')
-from curtin import util
-
-
-DATASOURCE_LIST = """\
-datasource_list: [ MAAS ]
-"""
-
-DATASOURCE = """\
-datasource:
-  MAAS: {{consumer_key: {consumer_key}, metadata_url: '{url}',
-    token_key: {token_key}, token_secret: {token_secret}}}
-"""
-
-
-def get_datasource(**kwargs):
-    """Returns the format cloud-init datasource."""
-    return DATASOURCE_LIST + DATASOURCE.format(**kwargs)
-
-
-def load_config(path):
-    """Loads the curtin config."""
-    with open(path, 'r') as stream:
-        return json.load(stream)
-
-
-def extract_maas_parameters(config):
-    """Extracts the needed values from the debconf
-    entry."""
-    params = {}
-    for line in config.splitlines():
-        cloud, key, type, value = line.split()[:4]
-        if key == "cloud-init/maas-metadata-url":
-            params['url'] = value
-        elif key == "cloud-init/maas-metadata-credentials":
-            values = value.split("&")
-            for oauth in values:
-                key, value = oauth.split('=')
-                if key == 'oauth_token_key':
-                    params['token_key'] = value
-                elif key == 'oauth_token_secret':
-                    params['token_secret'] = value
-                elif key == 'oauth_consumer_key':
-                    params['consumer_key'] = value
-    return params
-                 
-
-def get_maas_debconf_selections(config):
-    """Gets the debconf selections from the curtin config."""
-    try:
-        return config['debconf_selections']['maas']
-    except KeyError:
-        return None
-
-
-def write_datasource(target, data):
-    """Writes the cloudinit config into
-    /etc/cloud/cloud.cfg.d/90_datasource.cfg."""
-    path = os.path.join(
-        target, 'etc', 'cloud', 'cloud.cfg.d', '90_datasource.cfg')
-    with open(path, 'w') as stream:
-        stream.write(data + '\n')
-
-
-def main():
-    state = util.load_command_environment()
-    target = state['target']
-    if target is None:
-        print("Target was not provided in the environment.")
-        sys.exit(1)
-    config_f = state['config']
-    if config_f is None:
-        print("Config was not provided in the environment.")
-        sys.exit(1)
-    config = load_config(config_f)
-    
-    debconf = get_maas_debconf_selections(config)
-    if debconf is None:
-        print("Failed to get the debconf_selections.")
-        sys.exit(1)
-
-    params = extract_maas_parameters(debconf)
-    datasource = get_datasource(**params)
-    write_datasource(target, datasource)
-
-
-if __name__ == "__main__":
-    main()

=== target is u'python_wrapper'
=== added file 'contrib/centos/centos7/curtin/finalize.py'
--- contrib/centos/centos7/curtin/finalize.py	1970-01-01 00:00:00 +0000
+++ contrib/centos/centos7/curtin/finalize.py	2017-06-13 16:13:40 +0000
@@ -0,0 +1,100 @@
+#!/usr/bin/env python
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+import json
+import os
+import sys
+
+sys.path.append('/curtin')
+from curtin import util
+
+
+DATASOURCE_LIST = """\
+datasource_list: [ MAAS ]
+"""
+
+DATASOURCE = """\
+datasource:
+  MAAS: {{consumer_key: {consumer_key}, metadata_url: '{url}',
+    token_key: {token_key}, token_secret: {token_secret}}}
+"""
+
+
+def get_datasource(**kwargs):
+    """Returns the format cloud-init datasource."""
+    return DATASOURCE_LIST + DATASOURCE.format(**kwargs)
+
+
+def load_config(path):
+    """Loads the curtin config."""
+    with open(path, 'r') as stream:
+        return json.load(stream)
+
+
+def extract_maas_parameters(config):
+    """Extracts the needed values from the debconf
+    entry."""
+    params = {}
+    for line in config.splitlines():
+        cloud, key, type, value = line.split()[:4]
+        if key == "cloud-init/maas-metadata-url":
+            params['url'] = value
+        elif key == "cloud-init/maas-metadata-credentials":
+            values = value.split("&")
+            for oauth in values:
+                key, value = oauth.split('=')
+                if key == 'oauth_token_key':
+                    params['token_key'] = value
+                elif key == 'oauth_token_secret':
+                    params['token_secret'] = value
+                elif key == 'oauth_consumer_key':
+                    params['consumer_key'] = value
+    return params
+                 
+
+def get_maas_debconf_selections(config):
+    """Gets the debconf selections from the curtin config."""
+    try:
+        return config['debconf_selections']['maas']
+    except KeyError:
+        return None
+
+
+def write_datasource(target, data):
+    """Writes the cloudinit config into
+    /etc/cloud/cloud.cfg.d/90_datasource.cfg."""
+    path = os.path.join(
+        target, 'etc', 'cloud', 'cloud.cfg.d', '90_datasource.cfg')
+    with open(path, 'w') as stream:
+        stream.write(data + '\n')
+
+
+def main():
+    state = util.load_command_environment()
+    target = state['target']
+    if target is None:
+        print("Target was not provided in the environment.")
+        sys.exit(1)
+    config_f = state['config']
+    if config_f is None:
+        print("Config was not provided in the environment.")
+        sys.exit(1)
+    config = load_config(config_f)
+    
+    debconf = get_maas_debconf_selections(config)
+    if debconf is None:
+        print("Failed to get the debconf_selections.")
+        sys.exit(1)
+
+    params = extract_maas_parameters(debconf)
+    datasource = get_datasource(**params)
+    write_datasource(target, datasource)
+
+
+if __name__ == "__main__":
+    main()

=== added file 'contrib/centos/centos7/curtin/python_wrapper'
--- contrib/centos/centos7/curtin/python_wrapper	1970-01-01 00:00:00 +0000
+++ contrib/centos/centos7/curtin/python_wrapper	2017-06-13 16:13:40 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export PYTHONPATH='/curtin'
+
+# Ubuntu 16.04 only ships with Python 3 while previous versions only ship
+# with Python 2.
+if type -p python > /dev/null; then
+    exec python "$0.py" "$@"
+else
+    exec python3 "$0.py" "$@"
+fi

=== added directory 'contrib/rhel'
=== added symlink 'contrib/rhel/curtin'
=== target is u'../centos/centos7/curtin'
=== added file 'contrib/rhel/rhel7-amd64.ks'
--- contrib/rhel/rhel7-amd64.ks	1970-01-01 00:00:00 +0000
+++ contrib/rhel/rhel7-amd64.ks	2017-06-13 16:13:40 +0000
@@ -0,0 +1,128 @@
+#version=RHEL7
+install
+# Poweroff after installation
+poweroff
+# System authorization information
+auth --enableshadow --passalgo=sha512
+# Firewall configuration
+firewall --enabled --service=ssh
+firstboot --disable
+ignoredisk --only-use=vda
+# Keyboard layouts
+# old format: keyboard us
+# new format:
+keyboard --vckeymap=us --xlayouts='us'
+# System language
+lang en_US.UTF-8
+# Use CDROM installation media
+cdrom
+repo --name="repo0" --baseurl=http://mirrors.kernel.org/centos/7/os/x86_64 --includepkgs=python-pygments
+repo --name="repo1" --baseurl=http://mirrors.kernel.org/centos/7/updates/x86_64 --includepkgs=python-pygments
+repo --name="repo2" --baseurl=http://mirrors.kernel.org/centos/7/extras/x86_64
+repo --name="repo3" --baseurl=http://archives.fedoraproject.org/pub/archive/fedora/linux/releases/20/Everything/x86_64/os/ --includepkgs=python-oauth
+# Network information
+network  --bootproto=dhcp --device=eth0 --onboot=on
+# System bootloader configuration
+bootloader --append="console=ttyS0,115200n8 console=tty0" --location=mbr --driveorder="vda" --timeout=1
+# Root password
+rootpw --iscrypted nothing
+selinux --enforcing
+services --disabled="kdump" --enabled="network,sshd,rsyslog,chronyd"
+timezone UTC --isUtc
+# Disk
+zerombr
+clearpart --all --initlabel 
+part / --fstype="ext4" --size=3072
+
+%post --erroronfail
+
+# workaround anaconda requirements
+passwd -d root
+passwd -l root
+
+# remove avahi and networkmanager
+echo "Removing avahi/zeroconf and NetworkManager"
+yum -C -y remove avahi\* Network\*
+
+# make sure firstboot doesn't start
+echo "RUN_FIRSTBOOT=NO" > /etc/sysconfig/firstboot
+
+echo "Cleaning old yum repodata."
+yum clean all
+
+# chance dhcp client retry/timeouts to resolve #6866
+cat  >> /etc/dhcp/dhclient.conf << EOF
+
+timeout 300;
+retry 60;
+EOF
+
+# clean up installation logs"
+rm -rf /var/log/yum.log
+rm -rf /var/lib/yum/*
+rm -rf /root/install.log
+rm -rf /root/install.log.syslog
+rm -rf /root/anaconda-ks.cfg
+rm -rf /var/log/anaconda*
+rm -rf /root/anac*
+
+echo "Fixing SELinux contexts."
+touch /var/log/cron
+touch /var/log/boot.log
+mkdir -p /var/cache/yum
+/usr/sbin/fixfiles -R -a restore
+
+# reorder console entries
+sed -i 's/console=tty0/console=tty0 console=ttyS0,115200n8/' /boot/grub2/grub.cfg
+
+%end
+
+%packages
+@core
+chrony
+cloud-init
+cloud-utils-growpart
+dracut-config-generic
+dracut-norescue
+efibootmgr
+firewalld
+grub2
+grub2-efi-modules
+kernel
+rsync
+tar
+yum-utils
+python-oauth
+-NetworkManager
+-aic94xx-firmware
+-alsa-firmware
+-alsa-lib
+-alsa-tools-firmware
+-iprutils
+-ivtv-firmware
+-iwl100-firmware
+-iwl1000-firmware
+-iwl105-firmware
+-iwl135-firmware
+-iwl2000-firmware
+-iwl2030-firmware
+-iwl3160-firmware
+-iwl3945-firmware
+-iwl4965-firmware
+-iwl5000-firmware
+-iwl5150-firmware
+-iwl6000-firmware
+-iwl6000g2a-firmware
+-iwl6000g2b-firmware
+-iwl6050-firmware
+-iwl7260-firmware
+-iwl7265-firmware
+-libertas-sd8686-firmware
+-libertas-sd8787-firmware
+-libertas-usb8388-firmware
+-plymouth
+-postfix
+-wpa_supplicant
+
+%end
+

=== added directory 'contrib/windows'
=== added file 'contrib/windows/Autounattend.xml'
--- contrib/windows/Autounattend.xml	1970-01-01 00:00:00 +0000
+++ contrib/windows/Autounattend.xml	2017-06-13 16:13:40 +0000
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<unattend xmlns="urn:schemas-microsoft-com:unattend">
+    <settings pass="windowsPE">
+        <component name="Microsoft-Windows-Setup" processorArchitecture="{{arch}}" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <DiskConfiguration>
+                <WillShowUI>OnError</WillShowUI>
+                <Disk wcm:action="add">
+                    <CreatePartitions>
+                        <CreatePartition wcm:action="add">
+                            <Order>1</Order>
+                            <Size>100</Size>
+                            <Type>Primary</Type>
+                        </CreatePartition>
+                        <CreatePartition wcm:action="add">
+                            <Order>2</Order>
+                            <Extend>true</Extend>
+                            <Type>Primary</Type>
+                        </CreatePartition>
+                    </CreatePartitions>
+                    <ModifyPartitions>
+                        <ModifyPartition wcm:action="add">
+                            <Active>true</Active>
+                            <Label>Boot</Label>
+                            <Format>NTFS</Format>
+                            <Order>1</Order>
+                            <PartitionID>1</PartitionID>
+                        </ModifyPartition>
+                        <ModifyPartition wcm:action="add">
+                            <Format>NTFS</Format>
+                            <Order>2</Order>
+                            <PartitionID>2</PartitionID>
+                            <Label>System</Label>
+                        </ModifyPartition>
+                    </ModifyPartitions>
+                    <DiskID>0</DiskID>
+                    <WillWipeDisk>true</WillWipeDisk>
+                </Disk>
+            </DiskConfiguration>
+            <ImageInstall>
+                <OSImage>
+                    <InstallTo>
+                        <PartitionID>2</PartitionID>
+                        <DiskID>0</DiskID>
+                    </InstallTo>
+                    <InstallToAvailablePartition>false</InstallToAvailablePartition>
+                    <WillShowUI>OnError</WillShowUI>
+                    <InstallFrom>
+                        <MetaData wcm:action="add">
+                            <Key>/IMAGE/NAME</Key>
+                            <Value>{{image_name}}</Value>
+                        </MetaData>
+                    </InstallFrom>
+                </OSImage>
+            </ImageInstall>
+            <UserData>
+                <AcceptEula>true</AcceptEula>
+                {{if license_key}}
+                <ProductKey>
+                    <Key>{{license_key}}</Key>
+                    <WillShowUI>OnError</WillShowUI>
+                </ProductKey>
+                {{endif}}
+            </UserData>
+        </component>
+        <component name="Microsoft-Windows-International-Core-WinPE" processorArchitecture="{{arch}}" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State"xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <SetupUILanguage>
+                <UILanguage>{{language}}</UILanguage>
+            </SetupUILanguage>
+            <InputLocale>{{language}}</InputLocale>
+            <UILanguage>{{language}}</UILanguage>
+            <SystemLocale>{{language}}</SystemLocale>
+            <UserLocale>{{language}}</UserLocale>
+        </component>
+    </settings>
+    <settings pass="oobeSystem">
+        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="{{arch}}" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <VisualEffects>
+                <FontSmoothing>ClearType</FontSmoothing>
+            </VisualEffects>
+            <OOBE>
+                <HideEULAPage>true</HideEULAPage>
+                <ProtectYourPC>3</ProtectYourPC>
+                <NetworkLocation>Work</NetworkLocation>
+                <HideWirelessSetupInOOBE>true</HideWirelessSetupInOOBE>
+                <!-- Comment the following two options on Windows Vista / 7 and Windows Server 2008 / 2008 R2 -->
+                <!--
+                <HideOnlineAccountScreens>true</HideOnlineAccountScreens>
+                <HideLocalAccountScreen>true</HideLocalAccountScreen>
+                -->
+            </OOBE>
+            {{if enable_updates}}
+            <LogonCommands>
+                <AsynchronousCommand wcm:action="add">
+                    <CommandLine>%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell -NoLogo -NonInteractive -ExecutionPolicy RemoteSigned -File E:\scripts\logon.ps1</CommandLine>
+                    <Order>1</Order>
+                </AsynchronousCommand>
+            </LogonCommands>
+            {{else}}
+            <FirstLogonCommands>
+                <SynchronousCommand wcm:action="add">
+                    <CommandLine>%SystemRoot%\System32\WindowsPowerShell\v1.0\powershell -NoLogo -NonInteractive -ExecutionPolicy RemoteSigned -File E:\scripts\firstlogon.ps1</CommandLine>
+                    <Order>1</Order>
+                </SynchronousCommand>
+            </FirstLogonCommands>
+            {{endif}}
+            <UserAccounts>
+                <AdministratorPassword>
+                    <Value>Passw0rd</Value>
+                    <PlainText>true</PlainText>
+                </AdministratorPassword>
+            </UserAccounts>
+            <AutoLogon>
+                <Password>
+                    <Value>Passw0rd</Value>
+                    <PlainText>true</PlainText>
+                </Password>
+                <Enabled>true</Enabled>
+                <LogonCount>50</LogonCount>
+                <Username>Administrator</Username>
+            </AutoLogon>
+            <ComputerName>*</ComputerName>
+        </component>
+    </settings>
+    <settings pass="specialize">
+        <component name="Microsoft-Windows-TerminalServices-LocalSessionManager" processorArchitecture="{{arch}}" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <fDenyTSConnections>false</fDenyTSConnections>
+        </component>
+        <component name="Microsoft-Windows-TerminalServices-RDP-WinStationExtensions" processorArchitecture="{{arch}}" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <UserAuthentication>0</UserAuthentication>
+        </component>
+        <component name="Networking-MPSSVC-Svc" processorArchitecture="{{arch}}" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="nonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <FirewallGroups>
+                <FirewallGroup wcm:action="add" wcm:keyValue="RemoteDesktop">
+                    <Active>true</Active>
+                    <Profile>all</Profile>
+                    <Group>@FirewallAPI.dll,-28752</Group>
+                </FirewallGroup>
+            </FirewallGroups>
+        </component>
+        <component name="Microsoft-Windows-Shell-Setup" processorArchitecture="{{arch}}" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="NonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <TimeZone>UTC</TimeZone>
+            <ComputerName>*</ComputerName>
+        </component>
+        <component name="Microsoft-Windows-SQMApi" processorArchitecture="{{arch}}" publicKeyToken="31bf3856ad364e35" language="neutral" versionScope="NonSxS" xmlns:wcm="http://schemas.microsoft.com/WMIConfig/2002/State" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+            <CEIPEnabled>0</CEIPEnabled>
+        </component>
+    </settings>
+</unattend>

=== added directory 'contrib/windows/curtin'
=== added file 'contrib/windows/curtin/curtin-hooks'
--- contrib/windows/curtin/curtin-hooks	1970-01-01 00:00:00 +0000
+++ contrib/windows/curtin/curtin-hooks	2017-06-13 16:13:40 +0000
@@ -0,0 +1,1 @@
+#!/bin/bash

=== added symlink 'contrib/windows/curtin/finalize'
=== target is u'python_wrapper'
=== added file 'contrib/windows/curtin/finalize.py'
--- contrib/windows/curtin/finalize.py	1970-01-01 00:00:00 +0000
+++ contrib/windows/curtin/finalize.py	2017-06-13 16:13:40 +0000
@@ -0,0 +1,165 @@
+#!/usr/bin/env python
+
+from __future__ import (
+    absolute_import,
+    print_function,
+    unicode_literals,
+    )
+
+import os
+import sys
+import json
+
+sys.path.append('/curtin')
+from curtin import util
+
+CLOUDBASE_INIT_CONFIG = """\
+metadata_services=cloudbaseinit.metadata.services.maasservice.MaaSHttpService
+maas_metadata_url={url}
+maas_oauth_consumer_key={consumer_key}
+maas_oauth_consumer_secret=''
+maas_oauth_token_key={token_key}
+maas_oauth_token_secret={token_secret}
+"""
+
+
+LICENSE_KEY_SCRIPT = """\
+slmgr /ipk {license_key}
+Remove-Item $MyInvocation.InvocationName
+"""
+
+
+def load_config(path):
+    """Loads the curtin config."""
+    with open(path, 'r') as stream:
+        return json.load(stream)
+
+
+def get_maas_debconf_selections(config):
+    """Gets the debconf selections from the curtin config."""
+    try:
+        return config['debconf_selections']['maas']
+    except KeyError:
+        return None
+
+
+def extract_maas_parameters(config):
+    """Extracts the needed values from the debconf
+    entry."""
+    params = {}
+    for line in config.splitlines():
+        cloud, key, type, value = line.split()[:4]
+        if key == "cloud-init/maas-metadata-url":
+            params['url'] = value
+        elif key == "cloud-init/maas-metadata-credentials":
+            values = value.split("&")
+            for oauth in values:
+                key, value = oauth.split('=')
+                if key == 'oauth_token_key':
+                    params['token_key'] = value
+                elif key == 'oauth_token_secret':
+                    params['token_secret'] = value
+                elif key == 'oauth_consumer_key':
+                    params['consumer_key'] = value
+    return params
+
+
+def get_cloudbase_init_config(params):
+    """Returns the cloudbase-init config file."""
+    config = CLOUDBASE_INIT_CONFIG.format(**params)
+    output = ""
+    for line in config.splitlines():
+        output += "%s\r\n" % line
+    return output
+
+
+def write_cloudbase_init(target, params):
+    """Writes the configuration files for cloudbase-init."""
+    cloudbase_init_cfg = os.path.join(
+        target,
+        "Program Files",
+        "Cloudbase Solutions",
+        "Cloudbase-Init",
+        "conf",
+        "cloudbase-init.conf")
+    cloudbase_init_unattended_cfg = os.path.join(
+        target,
+        "Program Files",
+        "Cloudbase Solutions",
+        "Cloudbase-Init",
+        "conf",
+        "cloudbase-init-unattend.conf")
+
+    config = get_cloudbase_init_config(params)
+    with open(cloudbase_init_cfg, 'a') as stream:
+        stream.write(config)
+    with open(cloudbase_init_unattended_cfg, 'a') as stream:
+        stream.write(config)
+
+
+def get_license_key(config):
+    """Return license_key from the curtin config."""
+    try:
+        license_key = config['license_key']
+    except KeyError:
+        return None
+    if license_key is None:
+        return None
+    license_key = license_key.strip()
+    if license_key == '':
+        return None
+    return license_key
+
+
+def write_license_key_script(target, license_key):
+    local_scripts_path = os.path.join(
+        target,
+        "Program Files",
+        "Cloudbase Solutions",
+        "Cloudbase-Init",
+        "LocalScripts")
+    script_path = os.path.join(local_scripts_path, 'set_license_key.ps1')
+    set_key_script = LICENSE_KEY_SCRIPT.format(license_key=license_key)
+    with open(script_path, 'w') as stream:
+        for line in set_key_script.splitlines():
+            stream.write("%s\r\n" % line)
+
+
+def write_network_config(target, config):
+    network_config_path = os.path.join(target, 'network.json')
+    config_json = config.get('network', None)
+    if config_json is not None:
+        config_json = json.dumps(config_json)
+        with open(network_config_path, 'w') as stream:
+            for line in config_json.splitlines():
+                stream.write("%s\r\n" % line)
+
+
+def main():
+    state = util.load_command_environment()
+    target = state['target']
+    if target is None:
+        print("Target was not provided in the environment.")
+        sys.exit(1)
+    config_f = state['config']
+    if config_f is None:
+        print("Config was not provided in the environment.")
+        sys.exit(1)
+    config = load_config(config_f)
+
+    debconf = get_maas_debconf_selections(config)
+    if debconf is None:
+        print("Failed to get the debconf_selections.")
+        sys.exit(1)
+
+    params = extract_maas_parameters(debconf)
+    write_cloudbase_init(target, params)
+    write_network_config(target, config)
+
+    license_key = get_license_key(config)
+    if license_key is not None:
+        write_license_key_script(target, license_key)
+
+
+if __name__ == "__main__":
+    main()

=== added file 'contrib/windows/curtin/python_wrapper'
--- contrib/windows/curtin/python_wrapper	1970-01-01 00:00:00 +0000
+++ contrib/windows/curtin/python_wrapper	2017-06-13 16:13:40 +0000
@@ -0,0 +1,11 @@
+#!/bin/bash
+
+export PYTHONPATH='/curtin'
+
+# Ubuntu 16.04 only ships with Python 3 while previous versions only ship
+# with Python 2.
+if type -p python > /dev/null; then
+    exec python "$0.py" "$@"
+else
+    exec python3 "$0.py" "$@"
+fi

=== added directory 'contrib/windows/scripts'
=== added file 'contrib/windows/scripts/firstlogon.ps1'
--- contrib/windows/scripts/firstlogon.ps1	1970-01-01 00:00:00 +0000
+++ contrib/windows/scripts/firstlogon.ps1	2017-06-13 16:13:40 +0000
@@ -0,0 +1,104 @@
+$ErrorActionPreference = "Stop"
+
+function WaitForNetwork ($seconds) {
+    while (1) {
+        # Get a list of DHCP-enabled interfaces that have a
+        # non-$null DefaultIPGateway property.
+        $x = gwmi -class Win32_NetworkAdapterConfiguration `
+            -filter DHCPEnabled=TRUE |
+                where { $_.DefaultIPGateway -ne $null }
+
+        # If there is (at least) one available, exit the loop.
+        if ( ($x | measure).count -gt 0 ) {
+            break
+        }
+
+        # If $seconds > 0 and we have tried $seconds times without
+        # success, throw an exception.
+        if ( $seconds -gt 0 -and $try++ -ge $seconds ) {
+            throw "Network unavaiable after $try seconds."
+        }
+
+        # Wait one second.
+        start-sleep -s 1
+    }
+}
+
+try
+{
+    $osArch = (Get-WmiObject  Win32_OperatingSystem).OSArchitecture
+    if($osArch.StartsWith("64"))
+    {
+        $archDir = "x64"
+        $programFilesDir = ${ENV:ProgramFiles(x86)}
+    }
+    else
+    {
+        $archDir = "x86"
+        $programFilesDir = $ENV:ProgramFiles
+    }
+
+    # Inject extra drivers if the infs directory is present on the attached iso
+    if (Test-Path -Path "E:\infs")
+    {
+        # To install extra drivers the Windows Driver Kit is needed for dpinst.exe.
+        # Sadly you cannot just download dpinst.exe. The whole driver kit must be
+        # installed.
+
+        # Need to have network connection to continue, wait a maximum of 60
+        # seconds for the network to be active.
+        WaitForNetwork 60
+
+        # Download the WDK installer.
+        $Host.UI.RawUI.WindowTitle = "Downloading Windows Driver Kit..."
+        $webclient = New-Object System.Net.WebClient
+        $wdksetup = [IO.Path]::GetFullPath("$ENV:TEMP\wdksetup.exe")
+        $wdkurl = "http://download.microsoft.com/download/0/8/C/08C7497F-8551-4054-97DE-60C0E510D97A/wdk/wdksetup.exe"
+        $webclient.DownloadFile($wdkurl, $wdksetup)
+
+        # Run the installer.
+        $Host.UI.RawUI.WindowTitle = "Installing Windows Driver Kit..."
+        $p = Start-Process -PassThru -Wait -FilePath "$wdksetup" -ArgumentList "/features OptionId.WindowsDriverKitComplete /q /ceip off /norestart"
+        if ($p.ExitCode -ne 0)
+        {
+            throw "Installing $wdksetup failed."
+        }
+
+        # Run dpinst.exe with the path to the drivers.
+        $Host.UI.RawUI.WindowTitle = "Injecting Windows drivers..."
+        $dpinst = "$programFilesDir\Windows Kits\8.1\redist\DIFx\dpinst\EngMui\$archDir\dpinst.exe"
+        Start-Process -Wait -FilePath "$dpinst" -ArgumentList "/S /C /F /SA /Path E:\infs"
+
+        # Uninstall the WDK
+        $Host.UI.RawUI.WindowTitle = "Uninstalling Windows Driver Kit..."
+        Start-Process -Wait -FilePath "$wdksetup" -ArgumentList "/features + /q /uninstall /norestart"
+    }
+
+    $Host.UI.RawUI.WindowTitle = "Installing Cloudbase-Init..."
+    $cloudbaseInitPath = "E:\cloudbase\cloudbase_init.msi"
+    $cloudbaseInitLog = "$ENV:Temp\cloudbase_init.log"
+    $serialPortName = @(Get-WmiObject Win32_SerialPort)[0].DeviceId
+    $p = Start-Process -Wait -PassThru -FilePath msiexec -ArgumentList "/i $cloudbaseInitPath /qn /l*v $cloudbaseInitLog LOGGINGSERIALPORTNAME=$serialPortName"
+    if ($p.ExitCode -ne 0)
+    {
+        throw "Installing $cloudbaseInitPath failed. Log: $cloudbaseInitLog"
+    }
+
+    # We're done, disable AutoLogon
+    Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name AutoLogonCount
+
+    $Host.UI.RawUI.WindowTitle = "Running Cloudbase-Init SetSetupComplete..."
+    & "$ENV:ProgramFiles\Cloudbase Solutions\Cloudbase-Init\bin\SetSetupComplete.cmd"
+
+    # Write success, this is used to check that this process made it this far
+    New-Item -Path C:\success.tch -Type file -Force
+
+    $Host.UI.RawUI.WindowTitle = "Running Cloudbase-Init Sysprep..."
+    $unattendedXmlPath = "$ENV:ProgramFiles\Cloudbase Solutions\Cloudbase-Init\conf\Unattend.xml"
+    & "$ENV:SystemRoot\System32\Sysprep\Sysprep.exe" `/generalize `/oobe `/shutdown `/unattend:"$unattendedXmlPath"
+}
+catch
+{
+    $_ | Out-File C:\error_log.txt
+    shutdown /s /f /t 0
+}

=== added file 'contrib/windows/scripts/logon.ps1'
--- contrib/windows/scripts/logon.ps1	1970-01-01 00:00:00 +0000
+++ contrib/windows/scripts/logon.ps1	2017-06-13 16:13:40 +0000
@@ -0,0 +1,124 @@
+$ErrorActionPreference = "Stop"
+
+function WaitForNetwork ($seconds) {
+    while (1) {
+        # Get a list of DHCP-enabled interfaces that have a
+        # non-$null DefaultIPGateway property.
+        $x = gwmi -class Win32_NetworkAdapterConfiguration `
+            -filter DHCPEnabled=TRUE |
+                where { $_.DefaultIPGateway -ne $null }
+
+        # If there is (at least) one available, exit the loop.
+        if ( ($x | measure).count -gt 0 ) {
+            break
+        }
+
+        # If $seconds > 0 and we have tried $seconds times without
+        # success, throw an exception.
+        if ( $seconds -gt 0 -and $try++ -ge $seconds ) {
+            throw "Network unavaiable after $try seconds."
+        }
+
+        # Wait one second.
+        start-sleep -s 1
+    }
+}
+
+try
+{
+    # Need to have network connection to continue, wait a maximum of 60
+    # seconds for the network to be active.
+    WaitForNetwork 60
+
+    # Install PSWindowsUpdate modules for PowerShell
+    if (!(Test-Path -Path "$ENV:SystemRoot\System32\WindowsPowerShell\v1.0\Modules\PSWindowsUpdate"))
+    {
+        $Host.UI.RawUI.WindowTitle = "Installing PSWindowsUpdate..."
+        Copy-Item E:\PSWindowsUpdate $ENV:SystemRoot\System32\WindowsPowerShell\v1.0\Modules -recurse
+    }
+
+    # Start the Update process.
+    Import-Module PSWindowsUpdate
+    $Host.UI.RawUI.WindowTitle = "Installing updates..."
+    Get-WUInstall -AcceptAll -IgnoreReboot -IgnoreUserInput -NotCategory "Language packs"
+    if (Get-WURebootStatus -Silent)
+    {
+        $Host.UI.RawUI.WindowTitle = "Updates installation finished. Rebooting."
+        shutdown /r /t 0
+    }
+    else
+    {
+        $osArch = (Get-WmiObject  Win32_OperatingSystem).OSArchitecture
+        if($osArch.StartsWith("64"))
+        {
+            $archDir = "x64"
+            $programFilesDir = ${ENV:ProgramFiles(x86)}
+        }
+        else
+        {
+            $archDir = "x86"
+            $programFilesDir = $ENV:ProgramFiles
+        }
+
+        # Inject extra drivers if the infs directory is present on the attached iso
+        if (Test-Path -Path "E:\infs")
+        {
+            # To install extra drivers the Windows Driver Kit is needed for dpinst.exe.
+            # Sadly you cannot just download dpinst.exe. The whole driver kit must be
+            # installed.
+
+            # Download the WDK installer.
+            $Host.UI.RawUI.WindowTitle = "Downloading Windows Driver Kit..."
+            $webclient = New-Object System.Net.WebClient
+            $wdksetup = [IO.Path]::GetFullPath("$ENV:TEMP\wdksetup.exe")
+            $wdkurl = "http://download.microsoft.com/download/0/8/C/08C7497F-8551-4054-97DE-60C0E510D97A/wdk/wdksetup.exe"
+            $webclient.DownloadFile($wdkurl, $wdksetup)
+
+            # Run the installer.
+            $Host.UI.RawUI.WindowTitle = "Installing Windows Driver Kit..."
+            $p = Start-Process -PassThru -Wait -FilePath "$wdksetup" -ArgumentList "/features OptionId.WindowsDriverKitComplete /q /ceip off /norestart"
+            if ($p.ExitCode -ne 0)
+            {
+                throw "Installing $wdksetup failed."
+            }
+
+            # Run dpinst.exe with the path to the drivers.
+            $Host.UI.RawUI.WindowTitle = "Injecting Windows drivers..."
+            $dpinst = "$programFilesDir\Windows Kits\8.1\redist\DIFx\dpinst\EngMui\$archDir\dpinst.exe"
+            Start-Process -Wait -FilePath "$dpinst" -ArgumentList "/S /C /F /SA /Path E:\infs"
+
+            # Uninstall the WDK
+            $Host.UI.RawUI.WindowTitle = "Uninstalling Windows Driver Kit..."
+            Start-Process -Wait -FilePath "$wdksetup" -ArgumentList "/features + /q /uninstall /norestart"
+        }
+
+        $Host.UI.RawUI.WindowTitle = "Installing Cloudbase-Init..."
+        $cloudbaseInitPath = "E:\cloudbase\cloudbase_init.msi"
+        $cloudbaseInitLog = "$ENV:Temp\cloudbase_init.log"
+        $serialPortName = @(Get-WmiObject Win32_SerialPort)[0].DeviceId
+        $p = Start-Process -Wait -PassThru -FilePath msiexec -ArgumentList "/i $cloudbaseInitPath /qn /l*v $cloudbaseInitLog LOGGINGSERIALPORTNAME=$serialPortName"
+        if ($p.ExitCode -ne 0)
+        {
+            throw "Installing $cloudbaseInitPath failed. Log: $cloudbaseInitLog"
+        }
+
+        # We're done, remove LogonScript and disable AutoLogon
+        Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows\CurrentVersion\Run" -Name Unattend*
+        Remove-ItemProperty -Path "HKLM:\SOFTWARE\Microsoft\Windows NT\CurrentVersion\Winlogon" -Name AutoLogonCount
+
+        $Host.UI.RawUI.WindowTitle = "Running SetSetupComplete..."
+        & "$ENV:ProgramFiles\Cloudbase Solutions\Cloudbase-Init\bin\SetSetupComplete.cmd"
+
+        # Write success, this is used to check that this process made it this far
+        New-Item -Path C:\success.tch -Type file -Force
+
+        $Host.UI.RawUI.WindowTitle = "Running Sysprep..."
+        $unattendedXmlPath = "$ENV:ProgramFiles\Cloudbase Solutions\Cloudbase-Init\conf\Unattend.xml"
+        & "$ENV:SystemRoot\System32\Sysprep\Sysprep.exe" `/generalize `/oobe `/shutdown `/unattend:"$unattendedXmlPath"
+    }
+}
+catch
+{
+    $_ | Out-File C:\error_log.txt
+    shutdown /s /f /t 0
+}

=== modified file 'debian/changelog'
--- debian/changelog	2015-07-31 18:56:35 +0000
+++ debian/changelog	2017-06-13 16:13:40 +0000
@@ -1,3 +1,52 @@
+maas-image-builder (1.0.5+bzr54-0ubuntu1) UNRELEASED; urgency=low
+
+  * Fix --windows-drivers to not fail during logon and firstlogon.
+  * Fix kpartx_del to handle failures and retry up to 10 seconds.
+  * Prevent windows qemu VNC from listening on all addresses.
+
+ -- Blake Rouse <[e-mail]>  Fri, 9 Jun 2017 10:51:15 -0400
+
+maas-image-builder (1.0.4+bzr48-0ubuntu1) UNRELEASED; urgency=low
+
+  * Add --cloudbase-init option to Windows driver.
+  * Support appending custom kickstarter option to CentOS and RHEL drivers.
+  * RHEL driver use CentOS hook files.
+
+ -- Blake Rouse <[e-mail]>  Wed, 31 May 2017 13:50:18 -0400
+
+maas-image-builder (1.0.3+bzr44-0ubuntu1) UNRELEASED; urgency=low
+
+  * Fix Cent OS 7 UEFI to remove old EFI entries and place current boot
+    in-front of centos EFI loader.
+
+ -- Blake Rouse <[e-mail]>  Fri, 3 May 2017 20:08:32 -0400
+
+maas-image-builder (1.0.2+bzr42-0ubuntu1) UNRELEASED; urgency=low
+
+  * Fix Windows image builder to work with python3.
+
+ -- Blake Rouse <[e-mail]>  Fri, 21 Apr 2017 11:42:32 -0400
+
+maas-image-builder (1.0.1+bzr40-0ubuntu1) UNRELEASED; urgency=low
+
+  * Fix UEFI installation with CentOS 7
+
+ -- Blake Rouse <[e-mail]>  Fri, 21 Apr 2017 09:14:08 -0400
+
+maas-image-builder (1.0.0+bzr36-0ubuntu1) UNRELEASED; urgency=low
+
+  * Fix virt-install to work on systems with apparmor.
+  * Change from python2.7 to python3.
+
+ -- Blake Rouse <[e-mail]>  Wed, 19 Apr 2017 16:54:04 -0400
+
+maas-image-builder (0.9.0+bzr27-0ubuntu1) UNRELEASED; urgency=low
+
+  * Merge Windows and RHEL into the same code base. Make all of
+    maas-image-builder private and update the copyright..
+
+ -- Blake Rouse <[e-mail]>  Wed, 6 Jul 2016 11:14:18 -0400
+
 maas-image-builder (0.9.0+bzr24-0ubuntu1) UNRELEASED; urgency=low
 
   * Fix CentOS 6 & 7 to not use udev rules.

=== modified file 'debian/control'
--- debian/control	2015-03-11 19:32:46 +0000
+++ debian/control	2017-06-13 16:13:40 +0000
@@ -5,39 +5,46 @@
 Maintainer: Ubuntu Developers <[e-mail]>
 Build-Depends: debhelper (>= 7),
                dh-python,
-               python (>= 2.7),
-               python-setuptools
+               python3,
+               python3-setuptools
 Homepage: http://launchpad.net/maas-image-builder
-X-Python-Version: >= 2.7
+X-Python3-Version: >= 3.5
 
 Package: maas-image-builder
 Architecture: all
-Depends: python,
-         python-mib (= ${binary:Version}),
+Depends: python3,
+         python3-mib (= ${binary:Version}),
          ${misc:Depends},
-         ${python:Depends}
+         ${python3:Depends}
 Description: Library and tools for the MAAS Image Builder
  This package provides the MAAS Image Builder.
 
 Package: mib-common
 Architecture: all
-Depends: util-linux (>= 2.20.1-1ubuntu3), ${misc:Depends}, ${python:Depends}
+Depends: util-linux (>= 2.20.1-1ubuntu3), ${misc:Depends}, ${python3:Depends}
 Description: Library and tools for the MAAS Image Builder
  This package provides the MAAS Image Builder.
 
-Package: python-mib
+Package: python3-mib
 Section: python
 Architecture: all
-Depends: genisoimage,
+Depends: dos2unix,
+         dosfstools,
+         genisoimage,
          kpartx,
          kvm,
          libvirt-bin,
          mib-common (= ${binary:Version}),
-         python-stevedore,
+         ntfs-3g,
+         python3-stevedore,
+         python3-tempita,
+         qemu-kvm-spice,
          qemu-utils,
+         unzip,
          util-linux (>= 2.20.1-1ubuntu3),
          virtinst,
+         wget,
          ${misc:Depends},
-         ${python:Depends}
+         ${python3:Depends}
 Description: Library and tools for the MAAS Image Builder
  This package provides the MAAS Image Builder.

=== renamed file 'debian/python-mib.install' => 'debian/python3-mib.install'
--- debian/python-mib.install	2015-03-11 19:32:46 +0000
+++ debian/python3-mib.install	2017-06-13 16:13:40 +0000
@@ -1,1 +1,1 @@
-usr/lib/python2*/dist-packages/*
+usr/lib/python3*/dist-packages/*

=== modified file 'debian/rules'
--- debian/rules	2015-03-14 19:32:31 +0000
+++ debian/rules	2017-06-13 16:13:40 +0000
@@ -1,16 +1,16 @@
 #!/usr/bin/make -f
 
-PYTHON = $(shell pyversions -d)
+PYTHON3 = $(shell py3versions -d)
 
 %:
-	dh $@ --with=python2
+	dh $@ --with=python3
 
 override_dh_auto_build:
 	@echo "Auto build does nothing."
 
 override_dh_auto_install:
-	$(PYTHON) setup.py build --executable=/usr/bin/python
-	$(PYTHON) setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
+	$(PYTHON3) setup.py build --executable=/usr/bin/python3
+	$(PYTHON3) setup.py install --root=$(CURDIR)/debian/tmp --install-layout=deb
 
 	dh_install --list-missing
 

=== added file 'pylintrc'
--- pylintrc	1970-01-01 00:00:00 +0000
+++ pylintrc	2017-06-13 16:13:40 +0000
@@ -0,0 +1,425 @@
+[MASTER]
+
+# A comma-separated list of package or module names from where C extensions may
+# be loaded. Extensions are loading into the active Python interpreter and may
+# run arbitrary code
+extension-pkg-whitelist=
+
+# Add files or directories to the blacklist. They should be base names, not
+# paths.
+ignore=CVS
+
+# Add files or directories matching the regex patterns to the blacklist. The
+# regex matches against base names, not paths.
+ignore-patterns=
+
+# Python code to execute, usually for sys.path manipulation such as
+# pygtk.require().
+#init-hook=
+
+# Use multiple processes to speed up Pylint.
+jobs=1
+
+# List of plugins (as comma separated values of python modules names) to load,
+# usually to register additional checkers.
+load-plugins=
+
+# Pickle collected data for later comparisons.
+persistent=yes
+
+# Specify a configuration file.
+#rcfile=
+
+# Allow loading of arbitrary C extensions. Extensions are imported into the
+# active Python interpreter and may run arbitrary code.
+unsafe-load-any-extension=no
+
+
+[MESSAGES CONTROL]
+
+# Only show warnings with the listed confidence levels. Leave empty to show
+# all. Valid levels: HIGH, INFERENCE, INFERENCE_FAILURE, UNDEFINED
+confidence=
+
+# Disable the message, report, category or checker with the given id(s). You
+# can either give multiple identifiers separated by comma (,) or put this
+# option multiple times (only on the command line, not in the configuration
+# file where it should appear only once).You can also use "--disable=all" to
+# disable everything first and then reenable specific checks. For example, if
+# you want to run only the similarities checker, you can use "--disable=all
+# --enable=similarities". If you want to run only the classes checker, but have
+# no Warning level messages displayed, use"--disable=all --enable=classes
+# --disable=W"
+disable=print-statement,parameter-unpacking,unpacking-in-except,old-raise-syntax,backtick,long-suffix,old-ne-operator,old-octal-literal,import-star-module-level,raw-checker-failed,bad-inline-option,locally-disabled,locally-enabled,file-ignored,suppressed-message,useless-suppression,deprecated-pragma,apply-builtin,basestring-builtin,buffer-builtin,cmp-builtin,coerce-builtin,execfile-builtin,file-builtin,long-builtin,raw_input-builtin,reduce-builtin,standarderror-builtin,unicode-builtin,xrange-builtin,coerce-method,delslice-method,getslice-method,setslice-method,no-absolute-import,old-division,dict-iter-method,dict-view-method,next-method-called,metaclass-assignment,indexing-exception,raising-string,reload-builtin,oct-method,hex-method,nonzero-method,cmp-method,input-builtin,round-builtin,intern-builtin,unichr-builtin,map-builtin-not-iterating,zip-builtin-not-iterating,range-builtin-not-iterating,filter-builtin-not-iterating,using-cmp-argument,eq-without-hash,div-method,idiv-method,rdiv-method,exception-message-attribute,invalid-str-codec,sys-max-int,bad-python3-import,deprecated-string-function,deprecated-str-translate-call,similarities
+
+# Enable the message, report, category or checker with the given id(s). You can
+# either give multiple identifier separated by comma (,) or put this option
+# multiple time (only on the command line, not in the configuration file where
+# it should appear only once). See also the "--disable" option for examples.
+enable=
+
+
+[REPORTS]
+
+# Python expression which should return a note less than 10 (10 is the highest
+# note). You have access to the variables errors warning, statement which
+# respectively contain the number of errors / warnings messages and the total
+# number of statements analyzed. This is used by the global evaluation report
+# (RP0004).
+evaluation=10.0 - ((float(5 * error + warning + refactor + convention) / statement) * 10)
+
+# Template used to display messages. This is a python new-style format string
+# used to format the message information. See doc for all details
+#msg-template=
+
+# Set the output format. Available formats are text, parseable, colorized, json
+# and msvs (visual studio).You can also give a reporter class, eg
+# mypackage.mymodule.MyReporterClass.
+output-format=text
+
+# Tells whether to display a full report or only the messages
+reports=no
+
+# Activate the evaluation score.
+score=yes
+
+
+[REFACTORING]
+
+# Maximum number of nested blocks for function / method body
+max-nested-blocks=5
+
+
+[TYPECHECK]
+
+# List of decorators that produce context managers, such as
+# contextlib.contextmanager. Add to this list to register other decorators that
+# produce valid context managers.
+contextmanager-decorators=contextlib.contextmanager
+
+# List of members which are set dynamically and missed by pylint inference
+# system, and so shouldn't trigger E1101 when accessed. Python regular
+# expressions are accepted.
+generated-members=
+
+# Tells whether missing members accessed in mixin class should be ignored. A
+# mixin class is detected if its name ends with "mixin" (case insensitive).
+ignore-mixin-members=yes
+
+# This flag controls whether pylint should warn about no-member and similar
+# checks whenever an opaque object is returned when inferring. The inference
+# can return multiple potential results while evaluating a Python object, but
+# some branches might not be evaluated, which results in partial inference. In
+# that case, it might be useful to still emit no-member and other checks for
+# the rest of the inferred objects.
+ignore-on-opaque-inference=yes
+
+# List of class names for which member attributes should not be checked (useful
+# for classes with dynamically set attributes). This supports the use of
+# qualified names.
+ignored-classes=optparse.Values,thread._local,_thread._local
+
+# List of module names for which member attributes should not be checked
+# (useful for modules/projects where namespaces are manipulated during runtime
+# and thus existing member attributes cannot be deduced by static analysis. It
+# supports qualified module names, as well as Unix pattern matching.
+ignored-modules=
+
+# Show a hint with possible names when a member name was not found. The aspect
+# of finding the hint is based on edit distance.
+missing-member-hint=yes
+
+# The minimum edit distance a name should have in order to be considered a
+# similar match for a missing member name.
+missing-member-hint-distance=1
+
+# The total number of similar names that should be taken in consideration when
+# showing a hint for a missing member.
+missing-member-max-choices=1
+
+
+[VARIABLES]
+
+# List of additional names supposed to be defined in builtins. Remember that
+# you should avoid to define new builtins when possible.
+additional-builtins=
+
+# Tells whether unused global variables should be treated as a violation.
+allow-global-unused-variables=yes
+
+# List of strings which can identify a callback function by name. A callback
+# name must start or end with one of those strings.
+callbacks=cb_,_cb
+
+# A regular expression matching the name of dummy variables (i.e. expectedly
+# not used).
+dummy-variables-rgx=_+$|(_[a-zA-Z0-9_]*[a-zA-Z0-9]+?$)|dummy|^ignored_|^unused_
+
+# Argument names that match this expression will be ignored. Default to name
+# with leading underscore
+ignored-argument-names=_.*|^ignored_|^unused_
+
+# Tells whether we should check for unused import in __init__ files.
+init-import=no
+
+# List of qualified module names which can have objects that can redefine
+# builtins.
+redefining-builtins-modules=six.moves,future.builtins
+
+
+[BASIC]
+
+# Naming hint for argument names
+argument-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct argument names
+argument-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Naming hint for attribute names
+attr-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct attribute names
+attr-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Bad variable names which should always be refused, separated by a comma
+bad-names=foo,bar,baz,toto,tutu,tata
+
+# Naming hint for class attribute names
+class-attribute-name-hint=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Regular expression matching correct class attribute names
+class-attribute-rgx=([A-Za-z_][A-Za-z0-9_]{2,30}|(__.*__))$
+
+# Naming hint for class names
+class-name-hint=[A-Z_][a-zA-Z0-9]+$
+
+# Regular expression matching correct class names
+class-rgx=[A-Z_][a-zA-Z0-9]+$
+
+# Naming hint for constant names
+const-name-hint=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Regular expression matching correct constant names
+const-rgx=(([A-Z_][A-Z0-9_]*)|(__.*__))$
+
+# Minimum line length for functions/classes that require docstrings, shorter
+# ones are exempt.
+docstring-min-length=-1
+
+# Naming hint for function names
+function-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct function names
+function-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Good variable names which should always be accepted, separated by a comma
+good-names=i,j,k,ex,Run,_
+
+# Include a hint for the correct naming format with invalid-name
+include-naming-hint=no
+
+# Naming hint for inline iteration names
+inlinevar-name-hint=[A-Za-z_][A-Za-z0-9_]*$
+
+# Regular expression matching correct inline iteration names
+inlinevar-rgx=[A-Za-z_][A-Za-z0-9_]*$
+
+# Naming hint for method names
+method-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct method names
+method-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Naming hint for module names
+module-name-hint=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Regular expression matching correct module names
+module-rgx=(([a-z_][a-z0-9_]*)|([A-Z][a-zA-Z0-9]+))$
+
+# Colon-delimited sets of names that determine each other's naming style when
+# the name regexes allow several styles.
+name-group=
+
+# Regular expression which should only match function or class names that do
+# not require a docstring.
+no-docstring-rgx=^_
+
+# List of decorators that produce properties, such as abc.abstractproperty. Add
+# to this list to register other decorators that produce valid properties.
+property-classes=abc.abstractproperty
+
+# Naming hint for variable names
+variable-name-hint=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+# Regular expression matching correct variable names
+variable-rgx=(([a-z][a-z0-9_]{2,30})|(_[a-z0-9_]*))$
+
+
+[FORMAT]
+
+# Expected format of line ending, e.g. empty (any line ending), LF or CRLF.
+expected-line-ending-format=
+
+# Regexp for a line that is allowed to be longer than the limit.
+ignore-long-lines=^\s*(# )?<?https?://\S+>?$
+
+# Number of spaces of indent required inside a hanging  or continued line.
+indent-after-paren=4
+
+# String used as indentation unit. This is usually "    " (4 spaces) or "\t" (1
+# tab).
+indent-string='    '
+
+# Maximum number of characters on a single line.
+max-line-length=100
+
+# Maximum number of lines in a module
+max-module-lines=1000
+
+# List of optional constructs for which whitespace checking is disabled. `dict-
+# separator` is used to allow tabulation in dicts, etc.: {1  : 1,\n222: 2}.
+# `trailing-comma` allows a space between comma and closing bracket: (a, ).
+# `empty-line` allows space-only lines.
+no-space-check=trailing-comma,dict-separator
+
+# Allow the body of a class to be on the same line as the declaration if body
+# contains single statement.
+single-line-class-stmt=no
+
+# Allow the body of an if to be on the same line as the test if there is no
+# else.
+single-line-if-stmt=no
+
+
+[SIMILARITIES]
+
+# Ignore comments when computing similarities.
+ignore-comments=yes
+
+# Ignore docstrings when computing similarities.
+ignore-docstrings=yes
+
+# Ignore imports when computing similarities.
+ignore-imports=no
+
+# Minimum lines number of a similarity.
+min-similarity-lines=4
+
+
+[SPELLING]
+
+# Spelling dictionary name. Available dictionaries: none. To make it working
+# install python-enchant package.
+spelling-dict=
+
+# List of comma separated words that should not be checked.
+spelling-ignore-words=
+
+# A path to a file that contains private dictionary; one word per line.
+spelling-private-dict-file=
+
+# Tells whether to store unknown words to indicated private dictionary in
+# --spelling-private-dict-file option instead of raising a message.
+spelling-store-unknown-words=no
+
+
+[MISCELLANEOUS]
+
+# List of note tags to take in consideration, separated by a comma.
+notes=FIXME,XXX,TODO
+
+
+[LOGGING]
+
+# Logging modules to check that the string format arguments are in logging
+# function parameter format
+logging-modules=logging
+
+
+[IMPORTS]
+
+# Allow wildcard imports from modules that define __all__.
+allow-wildcard-with-all=no
+
+# Analyse import fallback blocks. This can be used to support both Python 2 and
+# 3 compatible code, which means that the block might have code that exists
+# only in one or another interpreter, leading to false positives when analysed.
+analyse-fallback-blocks=no
+
+# Deprecated modules which should not be used, separated by a comma
+deprecated-modules=optparse,tkinter.tix
+
+# Create a graph of external dependencies in the given file (report RP0402 must
+# not be disabled)
+ext-import-graph=
+
+# Create a graph of every (i.e. internal and external) dependencies in the
+# given file (report RP0402 must not be disabled)
+import-graph=
+
+# Create a graph of internal dependencies in the given file (report RP0402 must
+# not be disabled)
+int-import-graph=
+
+# Force import order to recognize a module as part of the standard
+# compatibility libraries.
+known-standard-library=
+
+# Force import order to recognize a module as part of a third party library.
+known-third-party=enchant
+
+
+[CLASSES]
+
+# List of method names used to declare (i.e. assign) instance attributes.
+defining-attr-methods=__init__,__new__,setUp
+
+# List of member names, which should be excluded from the protected access
+# warning.
+exclude-protected=_asdict,_fields,_replace,_source,_make
+
+# List of valid names for the first argument in a class method.
+valid-classmethod-first-arg=cls
+
+# List of valid names for the first argument in a metaclass class method.
+valid-metaclass-classmethod-first-arg=mcs
+
+
+[DESIGN]
+
+# Maximum number of arguments for function / method
+max-args=14
+
+# Maximum number of attributes for a class (see R0902).
+max-attributes=7
+
+# Maximum number of boolean expressions in a if statement
+max-bool-expr=5
+
+# Maximum number of branch for function / method body
+max-branches=12
+
+# Maximum number of locals for function / method body
+max-locals=15
+
+# Maximum number of parents for a class (see R0901).
+max-parents=7
+
+# Maximum number of public methods for a class (see R0904).
+max-public-methods=25
+
+# Maximum number of return / yield for function / method body
+max-returns=6
+
+# Maximum number of statements in function / method body
+max-statements=50
+
+# Minimum number of public methods for a class (see R0903).
+min-public-methods=2
+
+
+[EXCEPTIONS]
+
+# Exceptions that will emit a warning when being caught. Defaults to
+# "Exception"
+overgeneral-exceptions=Exception

=== modified file 'required-packages/base'
--- required-packages/base	2015-03-11 15:52:11 +0000
+++ required-packages/base	2017-06-13 16:13:40 +0000
@@ -1,7 +1,12 @@
+dos2unix
+dosfstools
 genisoimage
 kpartx
 kvm
 libvirt-bin
-python-stevedore
+ntfs-3g
+qemu-kvm-spice
 qemu-utils
+unzip
 virtinst
+wget

=== modified file 'required-packages/dev'
--- required-packages/dev	2015-03-10 20:42:06 +0000
+++ required-packages/dev	2017-06-13 16:13:40 +0000
@@ -1,18 +1,3 @@
 build-essential
+tox
 make
-pep8
-pyflakes
-python-coverage
-python-extras
-python-fixtures
-python-flake8
-python-mock
-python-nose
-python-pip
-python-pocket-lint
-python-subunit
-python-testresources
-python-testscenarios
-python-testtools
-python-unittest2
-python-virtualenv

=== added file 'requirements.txt'
--- requirements.txt	1970-01-01 00:00:00 +0000
+++ requirements.txt	2017-06-13 16:13:40 +0000
@@ -0,0 +1,2 @@
+stevedore
+tempita

=== modified file 'scripts/maas-image-builder'
--- scripts/maas-image-builder	2015-03-11 13:40:58 +0000
+++ scripts/maas-image-builder	2017-06-13 16:13:40 +0000
@@ -1,6 +1,45 @@
-#!/usr/bin/env python2.7
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
+#!/usr/bin/env python3
+# vi: ts=4 expandtab
+# Upstream Author:
+#
+#     Canonical Ltd.
+#
+# Copyright:
+#
+#     (c) 2014-2016 Canonical Ltd.
+#
+# Licence:
+#
+# If you have an executed agreement with a Canonical group company which
+# includes a licence to this software, your use of this software is governed
+# by that agreement.  Otherwise, the following applies:
+#
+# Canonical Ltd. hereby grants to you a world-wide, non-exclusive,
+# non-transferable, revocable, perpetual (unless revoked) licence, to (i) use
+# this software in connection with Canonical's MAAS software to install Windows
+# in non-production environments and (ii) to make a reasonable number of copies
+# of this software for backup and installation purposes.  You may not: use,
+# copy, modify, disassemble, decompile, reverse engineer, or distribute the
+# software except as expressly permitted in this licence; permit access to the
+# software to any third party other than those acting on your behalf; or use
+# this software in connection with a production environment.
+#
+# CANONICAL LTD. MAKES THIS SOFTWARE AVAILABLE "AS-IS".  CANONICAL  LTD. MAKES
+# NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, WHETHER ORAL OR WRITTEN,
+# WHETHER EXPRESS, IMPLIED, OR ARISING BY STATUTE, CUSTOM, COURSE OF DEALING
+# OR TRADE USAGE, WITH RESPECT TO THIS SOFTWARE.  CANONICAL LTD. SPECIFICALLY
+# DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OR CONDITIONS OF TITLE, SATISFACTORY
+# QUALITY, MERCHANTABILITY, SATISFACTORINESS, FITNESS FOR A PARTICULAR PURPOSE
+# AND NON-INFRINGEMENT.
+#
+# IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+# CANONICAL LTD. OR ANY OF ITS AFFILIATES, BE LIABLE TO YOU FOR DAMAGES,
+# INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE (INCLUDING BUT NOT LIMITED
+# TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+# OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.
 
 from __future__ import (
     absolute_import,

=== modified file 'setup.py'
--- setup.py	2015-07-31 18:46:41 +0000
+++ setup.py	2017-06-13 16:13:40 +0000
@@ -1,17 +1,47 @@
-#!/usr/bin/env python2.7
-# Copyright 2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
+#!/usr/bin/env python3
+# Upstream Author:
+#
+#     Canonical Ltd.
+#
+# Copyright:
+#
+#     (c) 2014-2017 Canonical Ltd.
+#
+# Licence:
+#
+# If you have an executed agreement with a Canonical group company which
+# includes a licence to this software, your use of this software is governed
+# by that agreement.  Otherwise, the following applies:
+#
+# Canonical Ltd. hereby grants to you a world-wide, non-exclusive,
+# non-transferable, revocable, perpetual (unless revoked) licence, to (i) use
+# this software in connection with Canonical's MAAS software to install Windows
+# in non-production environments and (ii) to make a reasonable number of copies
+# of this software for backup and installation purposes.  You may not: use,
+# copy, modify, disassemble, decompile, reverse engineer, or distribute the
+# software except as expressly permitted in this licence; permit access to the
+# software to any third party other than those acting on your behalf; or use
+# this software in connection with a production environment.
+#
+# CANONICAL LTD. MAKES THIS SOFTWARE AVAILABLE "AS-IS".  CANONICAL  LTD. MAKES
+# NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, WHETHER ORAL OR WRITTEN,
+# WHETHER EXPRESS, IMPLIED, OR ARISING BY STATUTE, CUSTOM, COURSE OF DEALING
+# OR TRADE USAGE, WITH RESPECT TO THIS SOFTWARE.  CANONICAL LTD. SPECIFICALLY
+# DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OR CONDITIONS OF TITLE, SATISFACTORY
+# QUALITY, MERCHANTABILITY, SATISFACTORINESS, FITNESS FOR A PARTICULAR PURPOSE
+# AND NON-INFRINGEMENT.
+#
+# IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+# CANONICAL LTD. OR ANY OF ITS AFFILIATES, BE LIABLE TO YOU FOR DAMAGES,
+# INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE (INCLUDING BUT NOT LIMITED
+# TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+# OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.
 
 """Distribute/Setuptools installer for MAAS Image Builder."""
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
 from glob import glob
 from os.path import (
     dirname,
@@ -35,32 +65,37 @@
         return fin.read().strip()
 
 
-__version__ = "0.9"
+__version__ = "1.0.2"
 
 setup(
     name="maas-image-builder",
     version=__version__,
     url="https://launchpad.net/maas-image-builder",
-    license="AGPLv3",
+    license="Proprietary",
     description="MAAS Image Builder",
-    long_description=read('README'),
+    long_description="",
 
     author="Blake Rouse",
     author_email="[e-mail]",
 
     packages=find_packages(
-        where=b'src',
+        where='src',
         exclude=[
-            b"*.testing",
-            b"*.tests",
+            "*.testing",
+            "*.tests",
             ],
         ),
-    package_dir={'': b'src'},
+    package_dir={'': 'src'},
     include_package_data=True,
 
     entry_points={
+        'console_scripts': [
+            'maas-image-builder = mib.core:execute',
+        ],
         'mib.builder': [
             'centos = mib.builders.centos:CentOSBuilder',
+            'rhel = mib.builders.rhel:RHELBuilder',
+            'windows = mib.builders.windows:WindowsOSBuilder',
         ],
     },
 
@@ -75,29 +110,23 @@
             [f for f in glob('contrib/centos/centos7/*') if isfile(f)]),
         ('/usr/lib/maas-image-builder/contrib/centos/centos7/curtin',
             [f for f in glob('contrib/centos/centos7/curtin/*') if isfile(f)]),
+        ('/usr/lib/maas-image-builder/contrib/rhel',
+            [f for f in glob('contrib/rhel/*') if isfile(f)]),
+        ('/usr/lib/maas-image-builder/contrib/rhel/curtin',
+            [f for f in glob('contrib/rhel/curtin/*') if isfile(f)]),
+        ('/usr/lib/maas-image-builder/contrib/windows',
+            [f for f in glob('contrib/windows/*') if isfile(f)]),
+        ('/usr/lib/maas-image-builder/contrib/windows/curtin',
+            [f for f in glob('contrib/windows/curtin/*') if isfile(f)]),
+        ('/usr/lib/maas-image-builder/contrib/windows/scripts',
+            [f for f in glob('contrib/windows/scripts/*') if isfile(f)]),
     ],
 
-    install_requires=[
-        'python-stevedore'
-        ],
     classifiers=[
         'Development Status :: 4 - Beta',
         'Intended Audience :: Developers',
         "Intended Audience :: System Administrators",
-        'License :: OSI Approved :: GPL License',
         'Operating System :: OS Independent',
         'Programming Language :: Python',
-        ],
-    extras_require=dict(
-        tests=[
-            'coverage',
-            'fixtures',
-            'mock',
-            'nose',
-            'python-subunit',
-            'testresources',
-            'testscenarios',
-            'testtools',
-            ],
-    )
+    ],
 )

=== modified file 'src/mib/__init__.py'
--- src/mib/__init__.py	2015-03-11 13:40:58 +0000
+++ src/mib/__init__.py	2017-06-13 16:13:40 +0000
@@ -1,8 +1,41 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
+# vi: ts=4 expandtab
+# Upstream Author:
+#
+#     Canonical Ltd.
+#
+# Copyright:
+#
+#     (c) 2014-2017 Canonical Ltd.
+#
+# Licence:
+#
+# If you have an executed agreement with a Canonical group company which
+# includes a licence to this software, your use of this software is governed
+# by that agreement.  Otherwise, the following applies:
+#
+# Canonical Ltd. hereby grants to you a world-wide, non-exclusive,
+# non-transferable, revocable, perpetual (unless revoked) licence, to (i) use
+# this software in connection with Canonical's MAAS software to install Windows
+# in non-production environments and (ii) to make a reasonable number of copies
+# of this software for backup and installation purposes.  You may not: use,
+# copy, modify, disassemble, decompile, reverse engineer, or distribute the
+# software except as expressly permitted in this licence; permit access to the
+# software to any third party other than those acting on your behalf; or use
+# this software in connection with a production environment.
+#
+# CANONICAL LTD. MAKES THIS SOFTWARE AVAILABLE "AS-IS".  CANONICAL  LTD. MAKES
+# NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, WHETHER ORAL OR WRITTEN,
+# WHETHER EXPRESS, IMPLIED, OR ARISING BY STATUTE, CUSTOM, COURSE OF DEALING
+# OR TRADE USAGE, WITH RESPECT TO THIS SOFTWARE.  CANONICAL LTD. SPECIFICALLY
+# DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OR CONDITIONS OF TITLE, SATISFACTORY
+# QUALITY, MERCHANTABILITY, SATISFACTORINESS, FITNESS FOR A PARTICULAR PURPOSE
+# AND NON-INFRINGEMENT.
+#
+# IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+# CANONICAL LTD. OR ANY OF ITS AFFILIATES, BE LIABLE TO YOU FOR DAMAGES,
+# INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE (INCLUDING BUT NOT LIMITED
+# TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+# OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.

=== modified file 'src/mib/builders/__init__.py'
--- src/mib/builders/__init__.py	2015-03-11 18:57:11 +0000
+++ src/mib/builders/__init__.py	2017-06-13 16:13:40 +0000
@@ -1,11 +1,46 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
+# vi: ts=4 expandtab
+# Upstream Author:
+#
+#     Canonical Ltd.
+#
+# Copyright:
+#
+#     (c) 2014-2017 Canonical Ltd.
+#
+# Licence:
+#
+# If you have an executed agreement with a Canonical group company which
+# includes a licence to this software, your use of this software is governed
+# by that agreement.  Otherwise, the following applies:
+#
+# Canonical Ltd. hereby grants to you a world-wide, non-exclusive,
+# non-transferable, revocable, perpetual (unless revoked) licence, to (i) use
+# this software in connection with Canonical's MAAS software to install Windows
+# in non-production environments and (ii) to make a reasonable number of copies
+# of this software for backup and installation purposes.  You may not: use,
+# copy, modify, disassemble, decompile, reverse engineer, or distribute the
+# software except as expressly permitted in this licence; permit access to the
+# software to any third party other than those acting on your behalf; or use
+# this software in connection with a production environment.
+#
+# CANONICAL LTD. MAKES THIS SOFTWARE AVAILABLE "AS-IS".  CANONICAL  LTD. MAKES
+# NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, WHETHER ORAL OR WRITTEN,
+# WHETHER EXPRESS, IMPLIED, OR ARISING BY STATUTE, CUSTOM, COURSE OF DEALING
+# OR TRADE USAGE, WITH RESPECT TO THIS SOFTWARE.  CANONICAL LTD. SPECIFICALLY
+# DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OR CONDITIONS OF TITLE, SATISFACTORY
+# QUALITY, MERCHANTABILITY, SATISFACTORINESS, FITNESS FOR A PARTICULAR PURPOSE
+# AND NON-INFRINGEMENT.
+#
+# IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+# CANONICAL LTD. OR ANY OF ITS AFFILIATES, BE LIABLE TO YOU FOR DAMAGES,
+# INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE (INCLUDING BUT NOT LIMITED
+# TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+# OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
+"""Built-in builders."""
 
 from abc import (
     ABCMeta,
@@ -82,22 +117,8 @@
 
     def build_image(self, params):
         """Builds the image with virt-install."""
-        output = params.output
-        interface = params.interface
-        ram = params.ram
-        vcpus = params.vcpus
-        arch = params.arch
-        os_type = self.os_type
-        os_variant = self.os_variant
-        disk_size = self.disk_size
-        interface_model = self.nic_model
-        install_location = self.install_location
-        install_cdrom = self.install_cdrom
-        extra_arguments = self.extra_arguments
-        initrd_inject = self.initrd_inject
-
         # Check for valid location
-        if install_location is None and install_cdrom is None:
+        if self.install_location is None and self.install_cdrom is None:
             raise BuildError(
                 "Missing install_location or install_cdrom for virt-install.")
 
@@ -113,39 +134,40 @@
             # Create the disk, and set the permissions
             # that will allow virt-install to access it
             disk_path = os.path.join(workdir, 'disk.img')
-            virt.create_disk(disk_path, disk_size, format='raw')
+            virt.create_disk(disk_path, self.disk_size, disk_format='raw')
             utils.subp(['chmod', '777', disk_path])
             disk_str = "path=%s,format=raw" % disk_path
 
             # Start the installation
             vm_name = 'img-build-%s' % full_name
-            network_str = 'bridge=%s' % interface
-            if interface_model is not None:
-                network_str = '%s,model=%s' % (network_str, interface_model)
-            if install_location:
+            network_str = 'bridge=%s' % params.interface
+            if self.nic_model is not None:
+                network_str = '%s,model=%s' % (
+                    network_str, self.nic_model)
+            if self.install_location:
                 virt.install_location(
                     vm_name,
-                    ram,
-                    arch,
-                    vcpus,
-                    os_type,
-                    os_variant,
+                    params.ram,
+                    params.arch,
+                    params.vcpus,
+                    self.os_type,
+                    self.os_variant,
                     disk_str,
                     network_str,
-                    install_location,
-                    initrd_inject=initrd_inject,
-                    extra_args=extra_arguments)
+                    self.install_location,
+                    initrd_inject=self.initrd_inject,
+                    extra_args=self.extra_arguments)
             else:
                 virt.install_cdrom(
                     vm_name,
-                    ram,
-                    arch,
-                    vcpus,
-                    os_type,
-                    os_variant,
+                    params.ram,
+                    params.arch,
+                    params.vcpus,
+                    self.os_type,
+                    self.os_variant,
                     disk_str,
                     network_str,
-                    install_cdrom)
+                    self.install_cdrom)
 
             # Remove the finished installation from virsh
             virt.undefine(vm_name)
@@ -167,4 +189,4 @@
                 utils.umount_loop(disk_path, mount_path)
 
             # Place in output
-            shutil.move(output_path, output)
+            shutil.move(output_path, params.output)

=== modified file 'src/mib/builders/centos.py'
--- src/mib/builders/centos.py	2015-03-11 18:57:11 +0000
+++ src/mib/builders/centos.py	2017-06-13 16:13:40 +0000
@@ -1,19 +1,52 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
+# vi: ts=4 expandtab
+# Upstream Author:
+#
+#     Canonical Ltd.
+#
+# Copyright:
+#
+#     (c) 2014-2017 Canonical Ltd.
+#
+# Licence:
+#
+# If you have an executed agreement with a Canonical group company which
+# includes a licence to this software, your use of this software is governed
+# by that agreement.  Otherwise, the following applies:
+#
+# Canonical Ltd. hereby grants to you a world-wide, non-exclusive,
+# non-transferable, revocable, perpetual (unless revoked) licence, to (i) use
+# this software in connection with Canonical's MAAS software to install Windows
+# in non-production environments and (ii) to make a reasonable number of copies
+# of this software for backup and installation purposes.  You may not: use,
+# copy, modify, disassemble, decompile, reverse engineer, or distribute the
+# software except as expressly permitted in this licence; permit access to the
+# software to any third party other than those acting on your behalf; or use
+# this software in connection with a production environment.
+#
+# CANONICAL LTD. MAKES THIS SOFTWARE AVAILABLE "AS-IS".  CANONICAL  LTD. MAKES
+# NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, WHETHER ORAL OR WRITTEN,
+# WHETHER EXPRESS, IMPLIED, OR ARISING BY STATUTE, CUSTOM, COURSE OF DEALING
+# OR TRADE USAGE, WITH RESPECT TO THIS SOFTWARE.  CANONICAL LTD. SPECIFICALLY
+# DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OR CONDITIONS OF TITLE, SATISFACTORY
+# QUALITY, MERCHANTABILITY, SATISFACTORINESS, FITNESS FOR A PARTICULAR PURPOSE
+# AND NON-INFRINGEMENT.
+#
+# IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+# CANONICAL LTD. OR ANY OF ITS AFFILIATES, BE LIABLE TO YOU FOR DAMAGES,
+# INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE (INCLUDING BUT NOT LIMITED
+# TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+# OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.
 
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
+"""Builder for CentOS."""
 
 import os
 import shutil
+import tempfile
 
-from mib.builders import (
-    BuildError,
-    VirtInstallBuilder,
-    )
+from mib.builders import BuildError, VirtInstallBuilder
 
 
 class CentOSBuilder(VirtInstallBuilder):
@@ -23,21 +56,29 @@
     name = "centos"
     arches = ["i386", "amd64"]
     os_type = "linux"
-    os_variant = "rhel5"
     disk_size = 5
     nic_model = "virtio"
     install_location = ""
 
+    @property
+    def os_variant(self):
+        if self.edition == '6':
+            return 'centos6.5'
+        return 'centos7.0'
+
     def full_name(self, params):
         return 'centos%s-%s' % (params.edition, params.arch)
 
-    def populate_parser(self, parser):
+    def populate_parser(self, parser):  # pylint: disable=no-self-use
         """Add parser options."""
         parser.add_argument(
             '--edition', default='7',
             help="CentOS edition to generate. (Default: 7)")
+        parser.add_argument(
+            '--custom-kickstart', default=None,
+            help="Path to a custom kickstart file used to customize the image")
 
-    def validate_params(self, params):
+    def validate_params(self, params):  # pylint: disable=no-self-use
         """Validates the command line parameters."""
         if params.edition not in ['6', '7']:
             raise BuildError(
@@ -46,6 +87,11 @@
             raise BuildError(
                 "Cannot generate CentOS 7 for i386, as only amd64 is "
                 "supported.")
+        if (params.custom_kickstart is not None and
+                not os.path.exists(params.custom_kickstart)):
+            raise BuildError(
+                "Custom kickstart file '%s' does not exist!" %
+                params.custom_kickstart)
 
     def modify_mount(self, mount_path):
         """Install the curtin directory into mount point."""
@@ -61,29 +107,50 @@
 
     def build_image(self, params):
         self.validate_params(params)
+        # pylint: disable=attribute-defined-outside-init
         self.edition = params.edition
+
         if self.edition == '6':
-            arch = params.arch
-            if arch == 'i386':
+            if params.arch == 'i386':
                 self.install_location = (
                     "http://mirror.centos.org/centos/6/os/i386")
-                self.extra_arguments = (
-                    "console=ttyS0 ks=file:/centos6-i386.ks text utf8")
-                self.initrd_inject = self.get_contrib_path(
+                base_kickstart_file = self.get_contrib_path(
                     "centos6/centos6-i386.ks")
-            elif arch == 'amd64':
+            elif params.arch == 'amd64':
                 self.install_location = (
                     "http://mirror.centos.org/centos/6/os/x86_64")
-                self.extra_arguments = (
-                    "console=ttyS0 ks=file:/centos6-amd64.ks text utf8")
-                self.initrd_inject = self.get_contrib_path(
+                base_kickstart_file = self.get_contrib_path(
                     "centos6/centos6-amd64.ks")
+            extra_arguments_template = "console=ttyS0 ks=file:/%s text utf8"
         elif self.edition == '7':
             self.install_location = (
                 "http://mirror.centos.org/centos/7/os/x86_64")
-            self.extra_arguments = (
-                "console=ttyS0 inst.ks=file:/centos7-amd64.ks text "
+            base_kickstart_file = self.get_contrib_path(
+                "centos7/centos7-amd64.ks")
+            extra_arguments_template = (
+                "console=ttyS0 inst.ks=file:/%s text "
                 "inst.cmdline inst.headless")
-            self.initrd_inject = self.get_contrib_path(
-                "centos7/centos7-amd64.ks")
+
+        if params.custom_kickstart is None:
+            self.extra_arguments = extra_arguments_template % os.path.basename(
+                base_kickstart_file)
+            self.initrd_inject = base_kickstart_file
+        else:
+            # If a custom kickstart file was given create a new file which
+            # concatenates the custom kickstart file to the end of ours.
+            tmp_file_path = tempfile.mktemp(prefix='maas-image-builder-')
+            with open(tmp_file_path, 'w') as tmp_file:
+                for ks_file_path in (
+                        base_kickstart_file, params.custom_kickstart):
+                    tmp_file.write('#\n# From %s\n#\n\n' % ks_file_path)
+                    with open(ks_file_path, 'r') as ks_file:
+                        for line in ks_file:
+                            tmp_file.write(line)
+            self.extra_arguments = extra_arguments_template % os.path.basename(
+                tmp_file_path)
+            self.initrd_inject = tmp_file_path
+
         super(CentOSBuilder, self).build_image(params)
+
+        if params.custom_kickstart is not None:
+            os.remove(self.initrd_inject)

=== added file 'src/mib/builders/rhel.py'
--- src/mib/builders/rhel.py	1970-01-01 00:00:00 +0000
+++ src/mib/builders/rhel.py	2017-06-13 16:13:40 +0000
@@ -0,0 +1,187 @@
+# vi: ts=4 expandtab
+# Upstream Author:
+#
+#     Canonical Ltd.
+#
+# Copyright:
+#
+#     (c) 2014-2017 Canonical Ltd.
+#
+# Licence:
+#
+# If you have an executed agreement with a Canonical group company which
+# includes a licence to this software, your use of this software is governed
+# by that agreement.  Otherwise, the following applies:
+#
+# Canonical Ltd. hereby grants to you a world-wide, non-exclusive,
+# non-transferable, revocable, perpetual (unless revoked) licence, to (i) use
+# this software in connection with Canonical's MAAS software to install Windows
+# in non-production environments and (ii) to make a reasonable number of copies
+# of this software for backup and installation purposes.  You may not: use,
+# copy, modify, disassemble, decompile, reverse engineer, or distribute the
+# software except as expressly permitted in this licence; permit access to the
+# software to any third party other than those acting on your behalf; or use
+# this software in connection with a production environment.
+#
+# CANONICAL LTD. MAKES THIS SOFTWARE AVAILABLE "AS-IS".  CANONICAL  LTD. MAKES
+# NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, WHETHER ORAL OR WRITTEN,
+# WHETHER EXPRESS, IMPLIED, OR ARISING BY STATUTE, CUSTOM, COURSE OF DEALING
+# OR TRADE USAGE, WITH RESPECT TO THIS SOFTWARE.  CANONICAL LTD. SPECIFICALLY
+# DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OR CONDITIONS OF TITLE, SATISFACTORY
+# QUALITY, MERCHANTABILITY, SATISFACTORINESS, FITNESS FOR A PARTICULAR PURPOSE
+# AND NON-INFRINGEMENT.
+#
+# IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+# CANONICAL LTD. OR ANY OF ITS AFFILIATES, BE LIABLE TO YOU FOR DAMAGES,
+# INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE (INCLUDING BUT NOT LIMITED
+# TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+# OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.
+
+"""Builder for RHEL."""
+
+import os
+import shutil
+
+from mib import utils
+from mib.builders import BuildError, VirtInstallBuilder
+
+ISOLINUX_CFG = (
+    "default text\n"
+    "timeout 0\n"
+    "\n"
+    "label text\n"
+    "  kernel vmlinuz\n"
+    "  append initrd=initrd.img linux text console=ttyS0 inst.repo=cdrom "
+    "inst.ks=cdrom:/ks.cfg inst.cmdline inst.headless\n")
+
+
+class RHELBuilder(VirtInstallBuilder):
+    """Builds the RHEL image for amd64. Uses virt-install
+    to perform this installation process."""
+
+    name = "rhel"
+    arches = ["amd64"]
+    os_type = "linux"
+    os_variant = "rhel7.0"
+    disk_size = 5
+    nic_model = "virtio"
+
+    def populate_parser(self, parser):
+        """Add parser arguments."""
+        parser.add_argument(
+            '--rhel-iso', required=True,
+            help="Path to RHEL installation ISO.")
+        parser.add_argument(
+            '--custom-kickstart', default=None,
+            help="Path to a custom kickstart file used to customize the image")
+
+    def validate_params(self, params):
+        """Validates the command line parameters."""
+        self.install_cdrom = params.rhel_iso
+        if self.install_cdrom is None:
+            raise BuildError(
+                "RHEL requires the --rhel-iso option.")
+        if not os.path.exists(self.install_cdrom):
+            raise BuildError(
+                "Invalid RHEL iso. File does not exist.")
+        if (params.custom_kickstart is not None and
+                not os.path.exists(params.custom_kickstart)):
+            raise BuildError(
+                "Custom kickstart file '%s' does not exist!" %
+                params.custom_kickstart)
+
+    def mount_iso(self, workdir, source):  # pylint: disable=no-self-use
+        """Mounts iso in 'iso' directory under workdir."""
+        iso_dir = os.path.join(workdir, 'iso')
+        os.mkdir(iso_dir)
+        utils.subp([
+            'mount',
+            source,
+            iso_dir,
+            ])
+        return iso_dir
+
+    def umount_iso(self, iso_dir):  # pylint: disable=no-self-use
+        """Unmounts iso at path."""
+        utils.subp(['umount', iso_dir])
+
+    def copy_iso(self, workdir, iso_dir):  # pylint: disable=no-self-use
+        """Copies the contents of the iso_dir, into output dir."""
+        output = os.path.join(workdir, 'output')
+        shutil.copytree(iso_dir, output)
+        return output
+
+    def write_ks(self, output_dir, custom_kickstart=None):
+        """Writes the kickstarter config into the output_dir at 'ks.cfg'."""
+        base_kickstart_file = self.get_contrib_path('rhel7-amd64.ks')
+        output_file = os.path.join(output_dir, 'ks.cfg')
+        if custom_kickstart is None:
+            shutil.copyfile(base_kickstart_file, output_file)
+        else:
+            with open(output_file, 'w') as output:
+                for ks_file_path in (base_kickstart_file, custom_kickstart):
+                    output.write('#\n# From %s\n#\n\n' % ks_file_path)
+                    with open(ks_file_path, 'r') as ks_file:
+                        for line in ks_file:
+                            output.write(line)
+
+    def set_timeout_zero(self, output_dir):  # pylint: disable=no-self-use
+        """Sets the isolinux.cfg timeout to zero."""
+        isolinux_cfg = os.path.join(output_dir, 'isolinux', 'isolinux.cfg')
+        with open(isolinux_cfg, 'w') as stream:
+            stream.write(ISOLINUX_CFG + '\n')
+
+    def create_iso(self, workdir, source):  # pylint: disable=no-self-use
+        """Creates iso at output, containing files at source."""
+        output = os.path.join(workdir, 'output.iso')
+        utils.subp([
+            'mkisofs',
+            '-o', output,
+            '-b', 'isolinux/isolinux.bin',
+            '-c', 'isolinux/boot.cat',
+            '-no-emul-boot',
+            '-boot-load-size', '4',
+            '-boot-info-table', '-R', '-J', '-v',
+            '-T', source
+            ])
+        utils.subp(['chmod', '777', workdir])
+        utils.subp(['chmod', '777', output])
+        return output
+
+    def modify_mount(self, mount_path):
+        """Install the curtin directory into mount point."""
+        path = self.get_contrib_path('curtin')
+        if not os.path.exists(path):
+            return
+        opt_path = os.path.join(mount_path, 'curtin')
+        shutil.copytree(path, opt_path)
+
+    def build_image(self, params):
+        self.validate_params(params)
+
+        # Create work space
+        with utils.tempdir() as workdir:
+            # Copy out the contents of the ISO file.
+            iso_dir = self.mount_iso(workdir, self.install_cdrom)
+            try:
+                output_dir = self.copy_iso(workdir, iso_dir)
+            finally:
+                self.umount_iso(iso_dir)
+                shutil.rmtree(iso_dir)
+
+            # Write the kickstarter config.
+            self.write_ks(output_dir, params.custom_kickstart)
+
+            # Update isolinux to not have a timeout.
+            self.set_timeout_zero(output_dir)
+
+            # Create the final ISO for installation.
+            try:
+                self.install_cdrom = self.create_iso(workdir, output_dir)
+            finally:
+                shutil.rmtree(output_dir)
+
+            super(RHELBuilder, self).build_image(params)

=== added file 'src/mib/builders/windows.py'
--- src/mib/builders/windows.py	1970-01-01 00:00:00 +0000
+++ src/mib/builders/windows.py	2017-06-13 16:13:40 +0000
@@ -0,0 +1,497 @@
+# vi: ts=4 expandtab
+# Upstream Author:
+#
+#     Canonical Ltd.
+#
+# Copyright:
+#
+#     (c) 2014-2017 Canonical Ltd.
+#
+# Licence:
+#
+# If you have an executed agreement with a Canonical group company which
+# includes a licence to this software, your use of this software is governed
+# by that agreement.  Otherwise, the following applies:
+#
+# Canonical Ltd. hereby grants to you a world-wide, non-exclusive,
+# non-transferable, revocable, perpetual (unless revoked) licence, to (i) use
+# this software in connection with Canonical's MAAS software to install Windows
+# in non-production environments and (ii) to make a reasonable number of copies
+# of this software for backup and installation purposes.  You may not: use,
+# copy, modify, disassemble, decompile, reverse engineer, or distribute the
+# software except as expressly permitted in this licence; permit access to the
+# software to any third party other than those acting on your behalf; or use
+# this software in connection with a production environment.
+#
+# CANONICAL LTD. MAKES THIS SOFTWARE AVAILABLE "AS-IS".  CANONICAL  LTD. MAKES
+# NO REPRESENTATIONS OR WARRANTIES OF ANY KIND, WHETHER ORAL OR WRITTEN,
+# WHETHER EXPRESS, IMPLIED, OR ARISING BY STATUTE, CUSTOM, COURSE OF DEALING
+# OR TRADE USAGE, WITH RESPECT TO THIS SOFTWARE.  CANONICAL LTD. SPECIFICALLY
+# DISCLAIMS ANY AND ALL IMPLIED WARRANTIES OR CONDITIONS OF TITLE, SATISFACTORY
+# QUALITY, MERCHANTABILITY, SATISFACTORINESS, FITNESS FOR A PARTICULAR PURPOSE
+# AND NON-INFRINGEMENT.
+#
+# IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING WILL
+# CANONICAL LTD. OR ANY OF ITS AFFILIATES, BE LIABLE TO YOU FOR DAMAGES,
+# INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+# OUT OF THE USE OR INABILITY TO USE THIS SOFTWARE (INCLUDING BUT NOT LIMITED
+# TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU
+# OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+# PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+# POSSIBILITY OF SUCH DAMAGES.
+
+"""Builder for Windows."""
+
+import os
+import re
+import shutil
+import tempfile
+
+from tempita import Template
+
+from mib import net, utils
+from mib.builders import Builder, BuildError
+
+EDITIONS = {
+    'win2008r2': "Windows Server 2008 R2 SERVERSTANDARD",
+    'win2008hvr2': "Windows Server 2008 R2 SERVERHYPERCORE",
+    'win2012': "Windows Server 2012 SERVERSTANDARD",
+    'win2012hv': "Hyper-V Server 2012 SERVERHYPERCORE",
+    'win2012r2': "Windows Server 2012 R2 SERVERSTANDARD",
+    'win2012hvr2': "Hyper-V Server 2012 R2 SERVERHYPERCORE",
+    'win2016': "Windows Server 2016 SERVERSTANDARD",
+    'win2016hv': "Hyper-V Server 2016 SERVERHYPERCORE",
+    }
+
+
+class WindowsOSBuilder(Builder):
+    """Builds the Windows image using kvm-spice."""
+
+    name = "windows"
+    arches = ["i386", "amd64"]
+
+    def populate_parser(self, parser):
+        """Add parser options."""
+        parser.add_argument(
+            '--windows-iso',
+            help="Path to Windows installation ISO.")
+        parser.add_argument(
+            '--windows-edition',
+            help="Windows edition to install from the ISO.")
+        parser.add_argument(
+            '--windows-license-key',
+            help="Windows license key to embed into generated image.")
+        parser.add_argument(
+            '--windows-updates', action='store_true',
+            help=(
+                "Install all Windows updates into generated image. "
+                "(Requires access to microsoft.com)"))
+        parser.add_argument(
+            '--windows-drivers',
+            help=(
+                "Folder containing drivers to be injected into the Windows "
+                "installation before the image is generated."))
+        parser.add_argument(
+            '--windows-language',
+            default='en-US',
+            help="Windows installation language. Default: en-US")
+        parser.add_argument(
+            '--cloudbase-init',
+            help=(
+                "Path to the cloudbase-init installer to use. By default it "
+                "will be pulled from cloudbase.it"))
+
+    def validate_params(self, params):
+        """Validates the command line parameters."""
+        iso = params.windows_iso
+        if iso is None:
+            raise BuildError(
+                "Windows requires the --windows-iso option.")
+        if not os.path.exists(iso):
+            raise BuildError(
+                "Failed to access Windows ISO at: %s" % iso)
+        edition = params.windows_edition
+        if edition is None or edition == '':
+            raise BuildError(
+                "Windows requires the --windows-edition option.")
+        if edition not in EDITIONS.keys():
+            raise BuildError(
+                "Invalid Windows edition, should be one of %s." % (
+                    EDITIONS.keys()))
+        license_key = params.windows_license_key
+        if license_key is not None and license_key != '':
+            if not self.validate_license_key(license_key):
+                raise BuildError(
+                    "Invalid Windows license key.")
+        drivers = params.windows_drivers
+        if drivers is not None and not os.path.isdir(drivers):
+            raise BuildError(
+                "Invalid driver path: %s" % drivers)
+
+    def validate_license_key(self, license_key):  # pylint: disable=no-self-use
+        """Validates that license key is in the correct format. It does not
+        validate, if that license key will work with the selected edition of
+        Windows."""
+        regex = re.compile('^([A-Za-z0-9]{5}-){4}[A-Za-z0-9]{5}$')
+        return regex.match(license_key)
+
+    def load_unattended_template(self):
+        """Loads the unattended template that is used for installation."""
+        path = self.get_contrib_path('Autounattend.xml')
+        with open(path, "rb") as stream:
+            return Template(stream.read().decode('utf-8'))
+
+    def write_unattended(self, output_path, arch, edition, language,
+                         license_key=None, enable_updates=False):
+        """Outputs the effective unattended.xml file that will be used by
+        Windows during the installation."""
+        template = self.load_unattended_template()
+        image_name = EDITIONS[edition]
+        # Windows doesn't accept i386, instead that maps to x86.
+        if arch == 'i386':
+            arch = 'x86'
+        output = template.substitute(
+            arch=arch, image_name=image_name, language=language,
+            license_key=license_key, enable_updates=enable_updates)
+        with open(output_path, 'w') as stream:
+            for line in output.splitlines():
+                stream.write("%s\r\n" % line)
+
+    def create_floppy_disk(self, output_path):  # pylint: disable=no-self-use
+        """Creates an empty floppy disk, formatted with vfat."""
+        utils.subp([
+            'dd', 'if=/dev/zero',
+            'of=%s' % output_path,
+            'bs=1024', 'count=1440',
+            ])
+        utils.subp([
+            'mkfs.vfat',
+            output_path
+            ])
+
+    def prepare_floppy_disk(self, workdir, arch, edition, language,
+                            license_key=None, enable_updates=False):
+        """Prepares the working directory with Autounattend.vfd."""
+        # Create the disk
+        vfd_path = os.path.join(workdir, 'Autounattend.vfd')
+        self.create_floppy_disk(vfd_path)
+
+        # Mount the disk
+        mount_path = os.path.join(workdir, 'vfd_mount')
+        os.mkdir(mount_path)
+        utils.subp([
+            'mount',
+            '-t', 'vfat',
+            '-o', 'loop',
+            vfd_path, mount_path,
+            ])
+
+        # Place the generated Autounattend.xml file
+        xml_path = os.path.join(mount_path, 'Autounattend.xml')
+        try:
+            self.write_unattended(
+                xml_path, arch, edition, language,
+                license_key=license_key, enable_updates=enable_updates)
+        finally:
+            utils.subp(['umount', mount_path])
+            os.rmdir(mount_path)
+        return vfd_path
+
+    def download_cloudbase_init(  # pylint: disable=no-self-use
+            self, workdir, arch, cloudbase_init=None):
+        """Downloads cloudbase init."""
+        output_path = os.path.join(workdir, 'cloudbase_init.msi')
+        if arch == 'amd64':
+            msi_file = "CloudbaseInitSetup_x64.msi"
+        elif arch == 'i386':
+            msi_file = "CloudbaseInitSetup_x86.msi"
+        download_path = "http://www.cloudbase.it/downloads/" + msi_file
+
+        # --cloudbase-init passed in, don't download.
+        if cloudbase_init:
+            shutil.copyfile(cloudbase_init, output_path)
+            return output_path
+
+        # Remove me, testing only
+        tmp_path = os.path.join('/tmp', msi_file)
+        if os.path.exists(tmp_path):
+            shutil.copyfile(tmp_path, output_path)
+            return output_path
+
+        utils.subp([
+            'wget',
+            '-O', output_path,
+            download_path
+            ])
+        return output_path
+
+    def download_ps_windows_update(  # pylint: disable=no-self-use
+            self, workdir):
+        """Downloads the PSWindowsUpdate package."""
+        output_path = os.path.join(workdir, 'pswindowsupdate.zip')
+        download_path = (
+            "http://gallery.technet.microsoft.com/scriptcenter/"
+            "2d191bcd-3308-4edd-9de2-88dff796b0bc/file/41459/43/"
+            "PSWindowsUpdate.zip")
+        utils.subp([
+            'wget',
+            '-O', output_path,
+            download_path
+            ])
+        return output_path
+
+    def unzip_archive(self, src, dest):  # pylint: disable=no-self-use
+        """Un-zips an archive into destination."""
+        utils.subp([
+            'unzip', '-q',
+            src,
+            '-d', dest,
+            ])
+
+    def create_iso(self, output, source):  # pylint: disable=no-self-use
+        """Creates iso at output, containing files at source."""
+        utils.subp([
+            'genisoimage',
+            '-o', output,
+            '-V', 'SCRIPTS',
+            '-J', source
+            ])
+
+    def build_install_iso(self, workdir, arch, with_updates=False,
+                          drivers_path=None, cloudbase_init=None):
+        """Builds the iso that is mounted to Windows, to complete the
+        installation process."""
+        install_path = os.path.join(workdir, 'install')
+        os.mkdir(install_path)
+
+        # Download cloudbase-init into install/cloudbase
+        cloudbase_dir = os.path.join(install_path, 'cloudbase')
+        os.mkdir(cloudbase_dir)
+        self.download_cloudbase_init(
+            cloudbase_dir, arch, cloudbase_init=cloudbase_init)
+
+        # Copy contrib scripts into install/scripts
+        contrib_path = self.get_contrib_path('scripts')
+        scripts_path = os.path.join(install_path, 'scripts')
+        shutil.copytree(contrib_path, scripts_path)
+
+        # Copy the drivers if provided
+        if drivers_path is not None:
+            shutil.copytree(
+                drivers_path,
+                os.path.join(install_path, 'infs'))
+
+        # Place PSWindowsUpdate modules if using with_updates
+        if with_updates:
+            zip_path = self.download_ps_windows_update(workdir)
+            self.unzip_archive(zip_path, install_path)
+
+        # Create the iso
+        output_iso = os.path.join(workdir, 'install.iso')
+        self.create_iso(output_iso, install_path)
+        shutil.rmtree(install_path)
+        return output_iso
+
+    def create_disk_image(  # pylint: disable=no-self-use
+            self, output_path, size):
+        """Creates the disk image that Windows will install to."""
+        utils.subp([
+            'qemu-img', 'create',
+            '-f', 'raw',
+            output_path, size
+            ])
+
+    def spawn_vm(  # pylint: disable=no-self-use
+            self, ram, vcpus, cdrom, floppy, install_iso, disk,
+            tap=None):
+        """Spawns the qemu vm for Windows to install."""
+        args = [
+            'kvm-spice',
+            '-m', '%s' % ram, '-smp', vcpus,
+            '-cdrom', cdrom,
+            '-drive', 'file=%s,index=0,format=raw,if=ide,media=disk' % disk,
+            '-drive', 'file=%s,index=1,format=raw,if=floppy' % floppy,
+            '-drive', 'file=%s,index=3,format=raw,if=ide,media=cdrom' % install_iso,
+            ]
+        if tap is not None:
+            mac = net.get_random_qemu_mac()
+            args.extend([
+                '-device', 'rtl8139,netdev=net00,mac=%s' % mac,
+                '-netdev',
+                'type=tap,id=net00,script=no,downscript=no,ifname=%s' % tap,
+                ])
+        args.extend([
+            '-boot', 'd', '-vga', 'std',
+            '-k', 'en-us',
+            # Debug *Remove*
+            '-vnc', 'localhost:1',
+            ])
+        utils.subp(args)
+
+    def mount_partition(  # pylint: disable=no-self-use
+            self, workdir, disk_path, partition):
+        """Mounts the parition from the disk."""
+        mount_path = os.path.join(workdir, 'disk_mount')
+        os.mkdir(mount_path)
+        utils.mount_loop(disk_path, mount_path, partition)
+        return mount_path