Merge lp:~ltrager/maas/remove_tgt into lp:~maas-committers/maas/trunk

[Lee Trager]

Remove TGT configuration and monitoring.

[Mike Pontillo (mpontillo)]

Nice work! I bet it felt good to remove all that code. ;-)

Did you already test this end-to-end in conjunction with the packaging changes you proposed?

review: Needs Information

[Lee Trager (ltrager)]

Yes it did :) I tested this with all three branches locally and am working on fixing the CI tests.

[Mike Pontillo (mpontillo)]

Sounds great. If we have an IPv6 environment ready to go, we should test that, too. (Unfortunately, though I do have an IPv6 test network, I don't have any test devices that will boot from it.)

review: Approve

[lp:~ltrager/maas/remove_tgt]

6088. By Lee Trager on 2017-06-16

Merge trunk

6089. By Lee Trager on 2017-06-21

Merge rootfs_over_http

[Blake Rouse (blake-rouse)]

You will need to convert this to a git branch, as we will be in git before this gets to land.

[MAAS Lander (maas-lander)]

Transitioned to Git.

lp:maas has now moved from Bzr to Git.
Please propose your branches with Launchpad using Git.

git clone https://git.launchpad.net/maas

Unmerged revisions

6089. By Lee Trager on 2017-06-21

Merge rootfs_over_http

6088. By Lee Trager on 2017-06-16

Merge trunk

6087. By Lee Trager on 2017-06-14

Remove TGT configuration and monitoring.

=== modified file 'snap/bin/run-rackd'
--- snap/bin/run-rackd	2017-05-12 15:08:50 +0000
+++ snap/bin/run-rackd	2017-06-21 22:15:36 +0000
@@ -24,15 +24,5 @@
 export MAAS_ROOT="$SNAP_DATA"
 export MAAS_CLUSTER_CONFIG="$SNAP_DATA/rackd.conf"
 
-# Setup language and perl5 correctly. Needed by tgt-admin written in
-# Perl, yes really!
-#
-# XXX blake_r: Fix the hardcoded x86_64-linux-gnu to work for other
-# architectures.
-export LANGUAGE="C.UTF-8"
-export LC_ALL="C.UTF-8"
-export LANG="C.UTF-8"
-export PERL5LIB="$SNAP/usr/lib/x86_64-linux-gnu/perl/5.22:$SNAP/usr/share/perl/5.22:$SNAP/usr/share/perl5"
-
 # Run the rackd.
 exec $SNAP/bin/twistd --logger=provisioningserver.logger.EventLogger --nodaemon --pidfile= maas-rackd

=== removed file 'snap/bin/run-tgtd'
--- snap/bin/run-tgtd	2017-04-05 20:37:42 +0000
+++ snap/bin/run-tgtd	1970-01-01 00:00:00 +0000
@@ -1,37 +0,0 @@
-#!/bin/bash
-# Copyright 2017 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-set -e
-trap "kill -- -$$" EXIT
-
-# Configure tgtd socket.
-export TGT_IPC_SOCKET="$SNAP_DATA/tgtd-socket"
-
-# Setup language and perl5 correctly. Needed by tgt-admin written in
-# Perl, yes really!
-#
-# XXX blake_r: Fix the hardcoded x86_64-linux-gnu to work for other
-# architectures.
-export LANGUAGE="C.UTF-8"
-export LC_ALL="C.UTF-8"
-export LANG="C.UTF-8"
-export PERL5LIB="$SNAP/usr/lib/x86_64-linux-gnu/perl/5.22:$SNAP/usr/share/perl/5.22:$SNAP/usr/share/perl5"
-
-# Configuration paths.
-TGTD_CONFIG="$SNAP_DATA/var/lib/maas/boot-resources/current/maas.tgt"
-if [ ! -e "$TGTD_CONFIG" ]
-then
-    TGTD_CONFIG="$SNAP/usr/share/maas/empty.tgt"
-fi
-
-# Spawn tgtd.
-trap 'kill $PID; wait $PID' TERM INT
-$SNAP/usr/sbin/tgtd -f &
-PID=$!
-
-# Perform post start commands.
-$SNAP/usr/sbin/tgtadm --op update --mode sys --name State -v offline
-$SNAP/usr/sbin/tgt-admin -e -c "$TGTD_CONFIG"
-$SNAP/usr/sbin/tgtadm --op update --mode sys --name State -v ready
-wait $PID

=== modified file 'snap/conf/supervisord.conf.template'
--- snap/conf/supervisord.conf.template	2017-05-12 16:23:16 +0000
+++ snap/conf/supervisord.conf.template	2017-06-21 22:15:36 +0000
@@ -90,16 +90,6 @@
 redirect_stderr=true
 stdout_logfile=%(ENV_SNAP_COMMON)s/log/dhcpd6.log
 
-[program:tgt]
-process_name=tgt
-command=%(ENV_SNAP)s/bin/run-tgtd
-stopasgroup=true
-killasgroup=true
-redirect_stderr=true
-stdout_logfile=%(ENV_SNAP_COMMON)s/log/tgt.log
-{{endif}}
-
-
 {{if rackd or regiond}}
 [program:ntp]
 process_name=ntp

=== modified file 'snap/snapcraft.yaml'
--- snap/snapcraft.yaml	2017-05-30 15:57:19 +0000
+++ snap/snapcraft.yaml	2017-06-21 22:15:36 +0000
@@ -35,7 +35,6 @@
       - iproute2
       - isc-dhcp-client
       - isc-dhcp-server
-      - libconfig-general-perl
       - libjs-angularjs
       - libjs-jquery
       - libjs-yui3-full
@@ -46,7 +45,6 @@
       - postgresql
       - squid
       - tcpdump
-      - tgt
       - ubuntu-cloudimage-keyring
     install: |
       ln -s ../usr/lib/postgresql/9.5/bin/initdb $SNAPCRAFT_PART_INSTALL/bin/initdb
@@ -96,7 +94,6 @@
         - -usr/share/doc-base
         - -usr/share/lintian
         - -usr/share/man
-        - -usr/share/perl5
     organize:
       lib/python3.5/site-packages/etc: etc
       lib/python3.5/site-packages/usr: usr
@@ -121,7 +118,6 @@
     source: snap
     organize:
       bind: usr/share/maas/bind
-      conf/empty.tgt: usr/share/maas/empty.tgt
       conf/ntp.conf: usr/share/maas/ntp.conf
       conf/supervisord.conf.template: usr/share/maas/supervisord.conf.template
     stage:

=== modified file 'src/maasserver/bootresources.py'
--- src/maasserver/bootresources.py	2017-05-03 00:56:19 +0000
+++ src/maasserver/bootresources.py	2017-06-21 22:15:36 +0000
@@ -651,8 +651,7 @@
 
         # A ROOT_IMAGE may already be downloaded for the release if the stream
         # switched from one not containg SquashFS images to one that does. We
-        # want to use the SquashFS image but if both are available TGT will
-        # fail to start because both images will be shared with the same name.
+        # want to use the SquashFS image so ignore the tgz.
         if product['ftype'] == BOOT_RESOURCE_FILE_TYPE.SQUASHFS_IMAGE:
             resource_set.files.filter(
                 filetype=BOOT_RESOURCE_FILE_TYPE.ROOT_IMAGE).delete()

=== modified file 'src/maasserver/enum.py'
--- src/maasserver/enum.py	2017-03-10 08:46:42 +0000
+++ src/maasserver/enum.py	2017-06-21 22:15:36 +0000
@@ -406,13 +406,13 @@
     #: Root image in SquashFS form, does not need to be converted
     SQUASHFS_IMAGE = 'squashfs'
 
-    #: Boot Kernel (ISCSI kernel)
+    #: Boot Kernel
     BOOT_KERNEL = 'boot-kernel'
 
-    #: Boot Initrd (ISCSI initrd)
+    #: Boot Initrd
     BOOT_INITRD = 'boot-initrd'
 
-    #: Boot DTB (ISCSI dtb)
+    #: Boot DTB
     BOOT_DTB = 'boot-dtb'
 
     #: An uncompressed bootloader (PXELinux, GRUB, etc)

=== modified file 'src/maasserver/forms/settings.py'
--- src/maasserver/forms/settings.py	2017-06-21 22:15:36 +0000
+++ src/maasserver/forms/settings.py	2017-06-21 22:15:36 +0000
@@ -538,14 +538,6 @@
             'min_value': 1,
         },
     },
-    'http_boot': {
-        'default': False,
-        'form': forms.BooleanField,
-        'form_kwargs': {
-            'label': "When true all ephemeral environments boot over HTTP.",
-            'required': False
-        }
-    },
 }
 
 

=== modified file 'src/maasserver/models/config.py'
--- src/maasserver/models/config.py	2017-06-21 22:15:36 +0000
+++ src/maasserver/models/config.py	2017-06-21 22:15:36 +0000
@@ -102,7 +102,6 @@
         'max_node_installation_results': 1,
         # Notifications.
         'subnet_ip_exhaustion_threshold_count': 16,
-        'http_boot': False,
     }
 
 

=== modified file 'src/maasserver/models/service.py'
--- src/maasserver/models/service.py	2017-06-01 12:40:27 +0000
+++ src/maasserver/models/service.py	2017-06-21 22:15:36 +0000
@@ -37,7 +37,6 @@
     "rackd",
     "http",
     "tftp",
-    "tgt",
     "dhcpd",
     "dhcpd6",
     "ntp_rack",
@@ -52,7 +51,6 @@
     "rackd": SERVICE_STATUS.DEAD,
     "http": SERVICE_STATUS.DEAD,
     "tftp": SERVICE_STATUS.DEAD,
-    "tgt": SERVICE_STATUS.UNKNOWN,
     "dhcpd": SERVICE_STATUS.DEAD,
     "dhcpd6": SERVICE_STATUS.DEAD,
     "ntp_region": SERVICE_STATUS.DEAD,

=== modified file 'src/maasserver/static/js/angular/controllers/tests/test_node_details.js'
--- src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-06-02 21:36:12 +0000
+++ src/maasserver/static/js/angular/controllers/tests/test_node_details.js	2017-06-21 22:15:36 +0000
@@ -340,7 +340,6 @@
 
     it("updateServices sets $scope.services when node is loaded", function() {
         spyOn(ControllersManager, "getServices").and.returnValue([
-            { "status": "unknown", "name": "tgt" },
             { "status": "running", "name": "rackd" }
         ]);
         spyOn(ControllersManager, "setActiveItem").and.returnValue(
@@ -359,8 +358,7 @@
 
         expect(ControllersManager.getServices).toHaveBeenCalledWith(node);
         expect($scope.services).not.toBeNull();
-        expect(Object.keys($scope.services).length).toBe(2);
-        expect($scope.services.tgt.status).toBe('unknown');
+        expect(Object.keys($scope.services).length).toBe(1);
         expect($scope.services.rackd.status).toBe('running');
     });
 

=== modified file 'src/maasserver/static/partials/node-details.html'
--- src/maasserver/static/partials/node-details.html	2017-06-14 09:56:32 +0000
+++ src/maasserver/static/partials/node-details.html	2017-06-21 22:15:36 +0000
@@ -575,13 +575,6 @@
                                 <span data-ng-if="services.dhcpd6.status_info"> &mdash; {$ services.dhcpd6.status_info $}</span>
                             </span>
                         </li>
-                        <li class="list__item">
-                            <span>
-                                <span class="icon icon--{$ getServiceClass(services.tgt) $}"></span>
-                                &nbsp;tgt
-                                <span data-ng-if="services.tgt.status_info"> &mdash; {$ services.tgt.status_info $}</span>
-                            </span>
-                        </li>
                         <li class="list__item" data-ng-if="services.ntp_rack">
                             <span>
                                 <span class="icon icon--{$ getServiceClass(services.ntp_rack) $}"></span>

=== modified file 'src/provisioningserver/import_images/boot_resources.py'
--- src/provisioningserver/import_images/boot_resources.py	2017-05-03 00:56:19 +0000
+++ src/provisioningserver/import_images/boot_resources.py	2017-06-21 22:15:36 +0000
@@ -12,10 +12,8 @@
 import errno
 from io import StringIO
 import os
-from textwrap import dedent
 
 from provisioningserver.boot import BootMethodRegistry
-from provisioningserver.boot.tftppath import list_boot_images
 from provisioningserver.config import (
     BootSources,
     ClusterConfiguration,
@@ -36,20 +34,13 @@
 from provisioningserver.import_images.helpers import maaslog
 from provisioningserver.import_images.keyrings import write_all_keyrings
 from provisioningserver.import_images.product_mapping import map_products
-from provisioningserver.path import get_path
 from provisioningserver.rpc import getRegionClient
-from provisioningserver.service_monitor import service_monitor
-from provisioningserver.utils import sudo
 from provisioningserver.utils.fs import (
     atomic_symlink,
     atomic_write,
     read_text_file,
     tempdir,
 )
-from provisioningserver.utils.shell import (
-    call_and_check,
-    ExternalProcessError,
-)
 from twisted.internet.defer import inlineCallbacks
 from twisted.python.filepath import FilePath
 
@@ -58,47 +49,6 @@
     """Raised when the config file for the script doesn't exist."""
 
 
-def tgt_entry(osystem, arch, subarch, release, label, image):
-    """Generate tgt target used to commission arch/subarch with release
-
-    Tgt target used to commission arch/subarch machine with a specific Ubuntu
-    release should have the following name: ephemeral-arch-subarch-release.
-    This function creates target description in a format used by tgt-admin.
-    It uses arch, subarch and release to generate target name and image as
-    a path to image file which should be shared. Tgt target is marked as
-    read-only. Tgt target has 'allow-in-use' option enabled because this
-    script actively uses hardlinks to do image management and root images
-    in different folders may point to the same inode. Tgt doesn't allow us to
-    use the same inode for different tgt targets (even read-only targets which
-    looks like a bug to me) without this option enabled.
-
-    :param osystem: Operating System name we generate tgt target for
-    :param arch: Architecture name we generate tgt target for
-    :param subarch: Subarchitecture name we generate tgt target for
-    :param release: Ubuntu release we generate tgt target for
-    :param label: The images' label
-    :param image: Path to the image which should be shared via tgt/iscsi
-    :return Tgt entry which can be written to tgt-admin configuration file
-    """
-    prefix = 'iqn.2004-05.com.ubuntu:maas'
-    target_name = 'ephemeral-%s-%s-%s-%s-%s' % (
-        osystem,
-        arch,
-        subarch,
-        release,
-        label
-        )
-    entry = dedent("""\
-        <target {prefix}:{target_name}>
-            readonly 1
-            allow-in-use yes
-            backing-store "{image}"
-            driver iscsi
-        </target>
-        """).format(prefix=prefix, target_name=target_name, image=image)
-    return entry
-
-
 def link_bootloaders(destination):
     """Link the all the required file from each bootloader method.
     :param destination: Directory where the loaders should be stored.
@@ -127,42 +77,6 @@
     return parser
 
 
-def compose_targets_conf(snapshot_path):
-    """Produce the contents of a snapshot's tgt conf file.
-
-    :param snapshot_path: Filesystem path to a snapshot of current upstream
-        boot resources.
-    :return: Contents for a `targets.conf` file.
-    :rtype: bytes
-    """
-    # Use a set to make sure we don't register duplicate entries in tgt.
-    entries = set()
-    for item in list_boot_images(snapshot_path):
-        osystem = item['osystem']
-        arch = item['architecture']
-        subarch = item['subarchitecture']
-        release = item['release']
-        label = item['label']
-        entries.add((osystem, arch, subarch, release, label))
-    tgt_entries = []
-    for osystem, arch, subarch, release, label in sorted(entries):
-        base_path = os.path.join(
-            snapshot_path, osystem, arch, subarch,
-            release, label)
-        root_image = os.path.join(base_path, 'root-image')
-        if os.path.isfile(root_image):
-            entry = tgt_entry(
-                osystem, arch, subarch, release, label, root_image)
-            tgt_entries.append(entry)
-        squashfs_image = os.path.join(base_path, 'squashfs')
-        if os.path.isfile(squashfs_image):
-            entry = tgt_entry(
-                osystem, arch, subarch, release, label, squashfs_image)
-            tgt_entries.append(entry)
-    text = ''.join(tgt_entries)
-    return text.encode('utf-8')
-
-
 def meta_contains(storage, content):
     """Does the `maas.meta` file match `content`?
 
@@ -195,38 +109,6 @@
     atomic_write(meta_file_content.encode("ascii"), meta_file, mode=0o644)
 
 
-def write_targets_conf(snapshot):
-    """Write "maas.tgt" file."""
-    targets_conf = os.path.join(snapshot, 'maas.tgt')
-    targets_conf_content = compose_targets_conf(snapshot)
-    atomic_write(targets_conf_content, targets_conf, mode=0o644)
-
-
-def update_targets_conf(snapshot):
-    """Runs tgt-admin to update the new targets from "maas.tgt"."""
-    # Ensure that tgt is running before tgt-admin is used.
-    service_monitor.ensureService("tgt").wait(30)
-
-    # Update the tgt config.
-    targets_conf = os.path.join(snapshot, 'maas.tgt')
-
-    # The targets_conf may not exist in the event the BootSource is broken
-    # and images havn't been imported yet. This fixes LP:1655721
-    if not os.path.exists(targets_conf):
-        return
-
-    try:
-        call_and_check(sudo([
-            get_path('/usr/sbin/tgt-admin'),
-            '--conf', targets_conf,
-            '--update', 'ALL',
-            ]))
-    except ExternalProcessError as e:
-        msg = "Unable to update TGT config: %s" % e
-        try_send_rack_event(EVENT_TYPES.RACK_IMPORT_WARNING, msg)
-        maaslog.warning(msg)
-
-
 def read_sources(sources_yaml):
     """Read boot resources config file.
 
@@ -253,11 +135,6 @@
     return BootSources.parse(StringIO(sources_yaml))
 
 
-def update_iscsi_targets(snapshot_path):
-    maaslog.info("Updating boot image iSCSI targets.")
-    update_targets_conf(snapshot_path)
-
-
 def import_images(sources):
     """Import images.  Callable from the command line.
 
@@ -297,7 +174,6 @@
         image_descriptions = download_all_image_descriptions(
             sources, validate_products=False)
         if image_descriptions.is_empty():
-            update_iscsi_targets(os.path.join(storage, 'current'))
             msg = (
                 "Finished importing boot images, the region does not have "
                 "any boot images available.")
@@ -307,7 +183,6 @@
 
         meta_file_content = image_descriptions.dump_json()
         if meta_contains(storage, meta_file_content):
-            update_iscsi_targets(os.path.join(storage, 'current'))
             maaslog.info(
                 "Finished importing boot images, the region does not "
                 "have any new images.")
@@ -324,7 +199,6 @@
             try_send_rack_event(
                 EVENT_TYPES.RACK_IMPORT_ERROR,
                 "Unable to import boot images: %s" % e)
-            update_iscsi_targets(os.path.join(storage, 'current'))
             maaslog.error(
                 "Unable to import boot images; cleaning up failed snapshot "
                 "and cache.")
@@ -332,9 +206,8 @@
             cleanup_snapshots_and_cache(storage)
             raise
 
-    maaslog.info("Writing boot image metadata and iSCSI targets.")
+    maaslog.info("Writing boot image metadata.")
     write_snapshot_metadata(snapshot_path, meta_file_content)
-    write_targets_conf(snapshot_path)
 
     maaslog.info("Linking boot images snapshot %s" % snapshot_path)
     link_bootloaders(snapshot_path)
@@ -342,8 +215,6 @@
     # If we got here, all went well.  This is now truly the "current" snapshot.
     update_current_symlink(storage, snapshot_path)
 
-    update_iscsi_targets(snapshot_path)
-
     # Now cleanup the old snapshots and cache.
     maaslog.info('Cleaning up old snapshots and cache.')
     cleanup_snapshots_and_cache(storage)

=== modified file 'src/provisioningserver/import_images/download_resources.py'
--- src/provisioningserver/import_images/download_resources.py	2017-03-31 09:35:11 +0000
+++ src/provisioningserver/import_images/download_resources.py	2017-06-21 22:15:36 +0000
@@ -8,19 +8,15 @@
     ]
 
 from datetime import datetime
-from gzip import GzipFile
 import os.path
 import tarfile
 
-from provisioningserver.config import is_dev_environment
 from provisioningserver.import_images.helpers import (
     get_os_from_product,
     get_signing_policy,
     maaslog,
 )
 from provisioningserver.logger import LegacyLogger
-from provisioningserver.utils.shell import call_and_check
-from simplestreams.contentsource import FdContentSource
 from simplestreams.mirrors import (
     BasicMirrorWriter,
     UrlMirrorReader,
@@ -65,68 +61,6 @@
     return [(store._fullpath(tag), name)]
 
 
-def call_uec2roottar(root_image_path, root_tgz_path):
-    """Invoke `uec2roottar` with the given arguments.
-
-    Here only so tests can stub it out.
-
-    :param root_image_path: Input file.
-    :param root_tgz_path: Output file.
-    """
-    if is_dev_environment():
-        # In debug mode this is skipped as it requires the uec2roottar
-        # script to have sudo abilities. The root-tgz is created as an
-        # empty file so the correct links can be made.
-        log.msg(
-            "Conversion of root-image to root-tgz is skipped in DEVELOP mode.")
-        open(root_tgz_path, "wb").close()
-    else:
-        call_and_check([
-            'sudo', '/usr/bin/uec2roottar',
-            '--user=maas',
-            root_image_path,
-            root_tgz_path,
-            ])
-
-
-def insert_root_image(store, tag, checksums, size, content_source):
-    """Insert a root image into `store`.
-
-    This may involve converting a UEC boot image into a root tarball.
-
-    :param store: A simplestreams `ObjectStore`.
-    :param tag: UUID, or "tag," for the file root image file.  The root image
-        and root tarball will both be stored in the cache directory under
-        names derived from this tag.
-    :param checksums: A Simplestreams checksums dict, mapping hash algorihm
-        names (such as `sha256`) to the file's respective checksums as
-        computed by those hash algorithms.
-    :param size: Optional size for the file, so Simplestreams knows what size
-        to expect.
-    :param content_source: A Simplestreams `ContentSource` for reading the
-        file.
-    :return: A list of inserted files (root image and root tarball) described
-        as tuples of (path, logical name).  The path lies in the directory
-        managed by `store` and has a filename based on `tag`, not logical name.
-    """
-    maaslog.debug("Inserting root image (tag=%s, size=%s).", tag, size)
-    root_image_tag = 'root-image-%s' % tag
-    # XXX jtv 2014-04-24 bug=1313580: Isn't _fullpath meant to be private?
-    root_image_path = store._fullpath(root_image_tag)
-    root_tgz_tag = 'root-tgz-%s' % tag
-    root_tgz_path = store._fullpath(root_tgz_tag)
-    if not os.path.isfile(root_image_path):
-        maaslog.debug("New root image: %s.", root_image_path)
-        store.insert(tag, content_source, checksums, mutable=False, size=size)
-        uncompressed = FdContentSource(GzipFile(store._fullpath(tag)))
-        store.insert(root_image_tag, uncompressed, mutable=False)
-        store.remove(tag)
-    if not os.path.isfile(root_tgz_path):
-        maaslog.debug("Converting root tarball: %s.", root_tgz_path)
-        call_uec2roottar(root_image_path, root_tgz_path)
-    return [(root_image_path, 'root-image'), (root_tgz_path, 'root-tgz')]
-
-
 def extract_archive_tar(store, name, tag, checksums, size, content_source):
     """Extract an archive.tar.xz into `store`.
 
@@ -279,9 +213,6 @@
         if ftype == 'archive.tar.xz':
             links = extract_archive_tar(
                 self.store, filename, tag, checksums, size, contentsource)
-        elif ftype == 'root-image.gz':
-            links = insert_root_image(
-                self.store, tag, checksums, size, contentsource)
         else:
             links = insert_file(
                 self.store, filename, tag, checksums, size, contentsource)

=== modified file 'src/provisioningserver/import_images/tests/test_boot_resources.py'
--- src/provisioningserver/import_images/tests/test_boot_resources.py	2017-05-30 18:36:16 +0000
+++ src/provisioningserver/import_images/tests/test_boot_resources.py	2017-06-21 22:15:36 +0000
@@ -14,10 +14,6 @@
 import json
 import os
 from random import randint
-from subprocess import (
-    PIPE,
-    Popen,
-)
 from unittest import mock
 from unittest.mock import (
     call,
@@ -25,14 +21,11 @@
 )
 
 from maastesting.factory import factory
-from maastesting.fixtures import TempDirectory
 from maastesting.matchers import (
     MockAnyCall,
     MockCalledOnce,
-    MockCalledOnceWith,
     MockCalledWith,
     MockCallsMatch,
-    MockNotCalled,
 )
 from maastesting.testcase import MAASTestCase
 from maastesting.utils import age_file
@@ -50,13 +43,7 @@
     BootSourcesFixture,
     ClusterConfigurationFixture,
 )
-from provisioningserver.utils.fs import (
-    tempdir,
-    write_text_file,
-)
-from provisioningserver.utils.shell import ExternalProcessError
-from testtools.content import Content
-from testtools.content_type import UTF8_TEXT
+from provisioningserver.utils.fs import write_text_file
 from testtools.matchers import (
     DirExists,
     FileExists,
@@ -65,103 +52,6 @@
 import yaml
 
 
-class TestTgtEntry(MAASTestCase):
-    """Tests for `tgt_entry`."""
-
-    def test_generates_one_target(self):
-        spec = make_image_spec()
-        osystem = factory.make_name('osystem')
-        image = self.make_file()
-        entry = boot_resources.tgt_entry(
-            osystem, spec.arch, spec.subarch, spec.release, spec.label, image)
-        # The entry looks a bit like XML, but isn't well-formed.  So don't try
-        # to parse it as such!
-        self.assertIn('<target iqn.2004-05.com.ubuntu:maas:', entry)
-        self.assertIn('backing-store "%s"' % image, entry)
-        self.assertEqual(1, entry.count('</target>'))
-
-    def test_produces_suitable_output_for_tgt_admin(self):
-        spec = make_image_spec()
-        image = self.make_file()
-        osystem = factory.make_name('osystem')
-        entry = boot_resources.tgt_entry(
-            osystem, spec.arch, spec.subarch, spec.release, spec.label, image)
-        config = self.make_file(contents=entry)
-        # Pretend to be root, but without requiring the actual privileges and
-        # without prompting for a password.  In that state, run tgt-admin.
-        # It has to think it's root, even for a "pretend" run.
-        # Make it read the config we just produced, and pretend to update its
-        # iSCSI targets based on what it finds in the config.
-        #
-        # The only real test is that this succeed.
-        cmd = Popen(
-            [
-                'fakeroot', 'tgt-admin',
-                '--conf', config,
-                '--pretend',
-                '--update', 'ALL',
-            ],
-            stdout=PIPE, stderr=PIPE)
-        stdout, stderr = cmd.communicate()
-        self.addDetail('tgt-stderr', Content(UTF8_TEXT, lambda: [stderr]))
-        self.addDetail('tgt-stdout', Content(UTF8_TEXT, lambda: [stdout]))
-        self.assertEqual(0, cmd.returncode)
-
-
-class TestComposeTargetsConf(MAASTestCase):
-    """Tests for `compose_targets_conf`."""
-
-    def make_fake_boot_resource(
-            self, boot_resource_path, image, boot_images=None):
-        if boot_images is None:
-            boot_images = []
-        osystem = factory.make_name('osystem')
-        arch = factory.make_name('arch')
-        subarch = factory.make_name('subarch')
-        release = factory.make_name('release')
-        label = factory.make_name('label')
-        boot_images.append({
-            'osystem': osystem,
-            'architecture': arch,
-            'subarchitecture': subarch,
-            'release': release,
-            'label': label,
-        })
-        path = os.path.join(
-            boot_resource_path, osystem, arch, subarch, release, label)
-        os.makedirs(path)
-        path = os.path.join(path, image)
-        open(path, 'a').close()
-        return boot_images, path
-
-    def test__creates_root_image_entry(self):
-        with tempdir('boot_resource_path') as boot_resource_path:
-            boot_images, path = self.make_fake_boot_resource(
-                boot_resource_path, 'root-image')
-            self.patch(
-                boot_resources, 'list_boot_images').return_value = boot_images
-            output = boot_resources.compose_targets_conf(boot_resource_path)
-            self.assertIn(path, output.decode('utf-8'))
-
-    def test__creates_squashfs_entry(self):
-        with tempdir('boot_resource_path') as boot_resource_path:
-            boot_images, path = self.make_fake_boot_resource(
-                boot_resource_path, 'squashfs')
-            self.patch(
-                boot_resources, 'list_boot_images').return_value = boot_images
-            output = boot_resources.compose_targets_conf(boot_resource_path)
-            self.assertIn(path, output.decode('utf-8'))
-
-    def test__returns_empty_for_unknown_image(self):
-        with tempdir('boot_resource_path') as boot_resource_path:
-            boot_images, _ = self.make_fake_boot_resource(
-                boot_resource_path, factory.make_name('unknown_image'))
-            self.patch(
-                boot_resources, 'list_boot_images').return_value = boot_images
-            output = boot_resources.compose_targets_conf(boot_resource_path)
-            self.assertEquals(b'', output)
-
-
 class TestUpdateCurrentSymlink(MAASTestCase):
 
     def make_test_dirs(self):
@@ -468,7 +358,6 @@
         self.assertThat(current, DirExists())
         self.assertThat(os.path.join(current, 'pxelinux.0'), FileExists())
         self.assertThat(os.path.join(current, 'maas.meta'), FileExists())
-        self.assertThat(os.path.join(current, 'maas.tgt'), FileExists())
         self.assertThat(
             os.path.join(
                 current, osystem, arch, subarch, self.release, self.label),
@@ -549,7 +438,6 @@
             BootImageMapping())
         self.patch_maaslog()
         self.patch(boot_resources, 'RepoWriter')
-        self.patch(boot_resources, 'update_iscsi_targets')
         args = self.make_args(sources_file=sources_fixture.filename)
 
         boot_resources.main(args)
@@ -589,49 +477,6 @@
             boot_resources.NoConfigFile,
             boot_resources.main, self.make_args(sources="", sources_file=""))
 
-    def test_update_targets_conf_ensures_tgt_service(self):
-        mock_ensureService = self.patch(
-            boot_resources.service_monitor, "ensureService")
-        self.patch(boot_resources, "call_and_check")
-        boot_resources.update_targets_conf(factory.make_name("snapshot"))
-        self.assertThat(mock_ensureService, MockCalledOnceWith("tgt"))
-
-    def test_update_targets_conf_logs_error(self):
-        self.patch(boot_resources.service_monitor, "ensureService")
-        mock_try_send_rack_event = self.patch(
-            boot_resources, 'try_send_rack_event')
-        mock_maaslog = self.patch(boot_resources.maaslog, 'warning')
-        self.patch(boot_resources.os.path, 'exists').return_value = True
-        self.patch(boot_resources, 'call_and_check').side_effect = (
-            ExternalProcessError(
-                returncode=2, cmd=('tgt-admin',), output='error'))
-        snapshot = factory.make_name("snapshot")
-        boot_resources.update_targets_conf(snapshot)
-        self.assertThat(mock_try_send_rack_event, MockCalledOnce())
-        self.assertThat(mock_maaslog, MockCalledOnce())
-        self.assertThat(
-            boot_resources.call_and_check,
-            MockCalledOnceWith([
-                'sudo', '-n', '/usr/sbin/tgt-admin',
-                '--conf', os.path.join(snapshot, 'maas.tgt'),
-                '--update', 'ALL']))
-
-    def test_update_targets_only_runs_when_conf_exists(self):
-        # Regression test for LP:1655721
-        temp_dir = self.useFixture(TempDirectory()).path
-        self.useFixture(ClusterConfigurationFixture(tftp_root=temp_dir))
-        mock_ensureService = self.patch(
-            boot_resources.service_monitor, "ensureService")
-        mock_call_and_check = self.patch(boot_resources, "call_and_check")
-        mock_path_exists = self.patch(boot_resources.os.path, 'exists')
-        mock_path_exists.return_value = False
-        boot_resources.update_targets_conf(temp_dir)
-        self.assertThat(mock_ensureService, MockCalledOnceWith("tgt"))
-        self.assertThat(
-            mock_path_exists,
-            MockCalledOnceWith(os.path.join(temp_dir, 'maas.tgt')))
-        self.assertThat(mock_call_and_check, MockNotCalled())
-
 
 class TestMetaContains(MAASTestCase):
     """Tests for the `meta_contains` function."""
@@ -738,8 +583,6 @@
         fake_download_all_image_descriptions = self.patch(
             boot_resources, 'download_all_image_descriptions')
         fake_download_all_image_descriptions.return_value = MagicMock()
-        fake_update_iscsi_targets = self.patch(
-            boot_resources, 'update_iscsi_targets')
 
         self.patch(boot_resources, 'write_all_keyrings')
         sources = [
@@ -758,7 +601,6 @@
             },
             ],
         self.assertFalse(boot_resources.import_images(sources))
-        self.assertThat(fake_update_iscsi_targets, MockCalledOnce())
 
     def test__returns_false_when_no_new_images(self):
         # Stop import_images() from actually doing anything.
@@ -770,8 +612,6 @@
         fake_download_all_image_descriptions.return_value = (
             fake_image_descriptions)
         self.patch(boot_resources, 'meta_contains').return_value = True
-        fake_update_iscsi_targets = self.patch(
-            boot_resources, 'update_iscsi_targets')
 
         self.patch(boot_resources, 'write_all_keyrings')
         sources = [
@@ -790,7 +630,6 @@
             },
             ],
         self.assertFalse(boot_resources.import_images(sources))
-        self.assertThat(fake_update_iscsi_targets, MockCalledOnce())
 
     def test__cleans_up_on_failure(self):
         # Stop import_images() from actually doing anything.
@@ -806,8 +645,6 @@
         self.patch(
             boot_resources, 'download_all_boot_resources'
             ).side_effect = Exception
-        fake_update_iscsi_targets = self.patch(
-            boot_resources, 'update_iscsi_targets')
         fake_cleanup_snapshots_and_cache = self.patch(
             boot_resources, 'cleanup_snapshots_and_cache')
 
@@ -829,7 +666,6 @@
             ],
         self.assertRaises(
             Exception, boot_resources.import_images, sources)
-        self.assertThat(fake_update_iscsi_targets, MockCalledOnce())
         self.assertThat(fake_cleanup_snapshots_and_cache, MockCalledOnce())
 
     def test__runs_import_and_returns_true(self):
@@ -846,13 +682,9 @@
         self.patch(boot_resources, 'download_all_boot_resources')
         fake_write_snapshot_metadata = self.patch(
             boot_resources, 'write_snapshot_metadata')
-        fake_targets_conf = self.patch(
-            boot_resources, 'write_targets_conf')
         fake_link_bootloaders = self.patch(boot_resources, 'link_bootloaders')
         fake_update_current_symlink = self.patch(
             boot_resources, 'update_current_symlink')
-        fake_update_iscsi_targets = self.patch(
-            boot_resources, 'update_iscsi_targets')
         fake_cleanup_snapshots_and_cache = self.patch(
             boot_resources, 'cleanup_snapshots_and_cache')
 
@@ -874,8 +706,6 @@
             ],
         self.assertTrue(boot_resources.import_images(sources))
         self.assertThat(fake_write_snapshot_metadata, MockCalledOnce())
-        self.assertThat(fake_targets_conf, MockCalledOnce())
         self.assertThat(fake_link_bootloaders, MockCalledOnce())
         self.assertThat(fake_update_current_symlink, MockCalledOnce())
-        self.assertThat(fake_update_iscsi_targets, MockCalledOnce())
         self.assertThat(fake_cleanup_snapshots_and_cache, MockCalledOnce())

=== modified file 'src/provisioningserver/import_images/tests/test_download_resources.py'
--- src/provisioningserver/import_images/tests/test_download_resources.py	2017-01-28 00:51:47 +0000
+++ src/provisioningserver/import_images/tests/test_download_resources.py	2017-06-21 22:15:36 +0000
@@ -230,38 +230,6 @@
                 label=product['label'], subarches={subarch},
                 bootloader_type=None))
 
-    def test_inserts_root_image(self):
-        product_mapping = ProductMapping()
-        subarch = factory.make_name('subarch')
-        product = self.make_product(ftype='root-image.gz', subarch=subarch)
-        product_mapping.add(product, subarch)
-        repo_writer = download_resources.RepoWriter(
-            None, None, product_mapping)
-        self.patch(
-            download_resources, 'products_exdata').return_value = product
-        # Prevent MAAS from trying to actually write the file.
-        mock_insert_root_image = self.patch(
-            download_resources, 'insert_root_image')
-        mock_link_resources = self.patch(download_resources, 'link_resources')
-        # We only need to provide the product as the other fields are only used
-        # when writing the actual files to disk.
-        repo_writer.insert_item(product, None, None, None, None)
-        # None is used for the store and the content source as we're not
-        # writing anything to disk.
-        self.assertThat(
-            mock_insert_root_image,
-            MockCalledOnceWith(
-                None, product['sha256'], {'sha256': product['sha256']},
-                product['size'], None))
-        # links are mocked out by the mock_insert_file above.
-        self.assertThat(
-            mock_link_resources,
-            MockCalledOnceWith(
-                snapshot_path=None, links=mock.ANY, osystem=product['os'],
-                arch=product['arch'], release=product['release'],
-                label=product['label'], subarches={subarch},
-                bootloader_type=None))
-
     def test_inserts_file(self):
         product_mapping = ProductMapping()
         subarch = factory.make_name('subarch')

=== removed file 'src/provisioningserver/import_images/tests/test_uec2roottar.py'
--- src/provisioningserver/import_images/tests/test_uec2roottar.py	2016-06-22 17:03:02 +0000
+++ src/provisioningserver/import_images/tests/test_uec2roottar.py	1970-01-01 00:00:00 +0000
@@ -1,370 +0,0 @@
-# Copyright 2014-2016 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for the `uec2roottar` script and its supporting module.."""
-
-__all__ = []
-
-import os
-import os.path
-from subprocess import CalledProcessError
-from unittest import mock
-
-from maastesting.factory import factory
-from maastesting.matchers import (
-    MockAnyCall,
-    MockCalledOnceWith,
-    MockNotCalled,
-)
-from maastesting.testcase import MAASTestCase
-from provisioningserver.import_images import uec2roottar
-from testtools.matchers import HasLength
-from testtools.testcase import ExpectedException
-
-
-def make_image_name(suffix='.img'):
-    """Create an image file name (but not the actual file)."""
-    return factory.make_name('root') + suffix
-
-
-def make_image(testcase, contents=None, suffix='.img'):
-    """Create an image file."""
-    name = make_image_name(suffix)
-    return testcase.make_file(name=name, contents=contents)
-
-
-def make_tarball_name(prefix='tarball'):
-    """Create an arbitrary name for a tarball."""
-    return factory.make_name(prefix) + '.tar.gz'
-
-
-def make_roottar_location(testcase):
-    """Create a name for an output root tarball, in an empty directory."""
-    name = make_tarball_name('root')
-    return os.path.join(testcase.make_dir(), name)
-
-
-def patch_is_filesystem_file(testcase, answer):
-    """Patch `is_filesystem_file` to return the given answer."""
-    testcase.patch(uec2roottar, 'is_filesystem_file').return_value = answer
-
-
-class TestMakeArgParser(MAASTestCase):
-    """Tests for `make_argparser`."""
-
-    def test__defines_expected_options(self):
-        image = make_image(self)
-        output = make_roottar_location(self)
-        user = factory.make_name('user')
-
-        parser = uec2roottar.make_argparser(factory.make_string())
-        args = parser.parse_args([image, output, '--user', user])
-
-        self.assertEqual(
-            (
-                image,
-                output,
-                user,
-            ),
-            (
-                args.image,
-                args.output,
-                args.user,
-            ))
-
-    def test__user_defaults_to_None(self):
-        parser = uec2roottar.make_argparser(factory.make_string())
-        args = parser.parse_args(
-            [make_image(self), make_roottar_location(self)])
-        self.assertIsNone(args.user)
-
-
-class TestIsFilesystemFile(MAASTestCase):
-    """Tests for `is_filesystem_file`."""
-
-    def test__returns_True_if_file_looks_like_filesystem(self):
-        image = make_image(self, suffix='.img')
-        self.patch(uec2roottar, 'check_output').return_value = (
-            ("%s: filesystem data" % image).encode('utf-8'))
-        self.assertTrue(uec2roottar.is_filesystem_file(image))
-
-    def test__returns_False_for_tarball(self):
-        image = make_image(self, suffix='.tar.gz')
-        self.patch(uec2roottar, 'check_output').return_value = (
-            ("%s: gzip compressed data, was ..." % image).encode('utf-8'))
-        self.assertFalse(uec2roottar.is_filesystem_file(image))
-
-    def test__calls_file_with_C_language_setting(self):
-        env_during_invocation = {}
-
-        def fake_check_output(*args, **kwargs):
-            env_during_invocation.update(os.environ)
-            return b''
-
-        self.patch(uec2roottar, 'check_output', fake_check_output)
-
-        uec2roottar.is_filesystem_file(make_image(self))
-
-        self.assertEqual('C', env_during_invocation.get('LANG'))
-
-
-class TestExtractImageFromTarball(MAASTestCase):
-    """Tests for `extract_image_from_tarball`."""
-
-    def test__extracts_image(self):
-        tarball = make_tarball_name()
-        self.patch(uec2roottar, 'check_call')
-        self.patch(uec2roottar, 'check_output')
-        # Cheat: patch away extraction of the tarball, but pass a temporary
-        # directory with an image already in it.  The function will think it
-        # just extracted the image from the tarball.
-        image = make_image(self)
-        working_dir = os.path.dirname(image)
-
-        result = uec2roottar.extract_image_from_tarball(tarball, working_dir)
-
-        self.assertThat(
-            uec2roottar.check_call,
-            MockCalledOnceWith([
-                'tar',
-                '-C', working_dir,
-                '--wildcards', '*.img',
-                '-Sxvzf',
-                tarball,
-                ]))
-        self.assertEqual(image, result)
-
-    def test__ignores_other_files(self):
-        tarball = make_tarball_name()
-        self.patch(uec2roottar, 'check_call')
-        self.patch(uec2roottar, 'check_output')
-        # Make the function think that it found two files in the tarball: an
-        # image and some other file.
-        image = make_image(self)
-        working_dir = os.path.dirname(image)
-        # This other file doesn't upset things, because it doesn't look like
-        # an image file.
-        factory.make_file(working_dir)
-
-        self.assertEqual(
-            image,
-            uec2roottar.extract_image_from_tarball(tarball, working_dir))
-
-    def test__fails_if_no_image_found(self):
-        tarball = make_tarball_name()
-        self.patch(uec2roottar, 'check_call')
-        self.patch(uec2roottar, 'check_output')
-        empty_dir = self.make_dir()
-        error = self.assertRaises(
-            uec2roottar.ImageFileError,
-            uec2roottar.extract_image_from_tarball, tarball, empty_dir)
-        self.assertEqual(
-            "Tarball %s does not contain any *.img." % tarball,
-            str(error))
-
-    def test__fails_if_multiple_images_found(self):
-        tarball = make_tarball_name()
-        self.patch(uec2roottar, 'check_call')
-        self.patch(uec2roottar, 'check_output')
-        working_dir = self.make_dir()
-        files = sorted(
-            factory.make_file(working_dir, name=make_image_name())
-            for _ in range(2))
-        error = self.assertRaises(
-            uec2roottar.ImageFileError,
-            uec2roottar.extract_image_from_tarball, tarball, working_dir)
-        self.assertEqual(
-            "Tarball %s contains multiple image files: %s."
-            % (tarball, ', '.join(files)),
-            str(error))
-
-
-class TestGetImageFile(MAASTestCase):
-    """Tests for `get_image_file`."""
-
-    def test__returns_actual_image_file_unchanged(self):
-        patch_is_filesystem_file(self, True)
-        image = make_image(self)
-        self.assertEqual(
-            image,
-            uec2roottar.get_image_file(image, factory.make_name('dir')))
-
-    def test__extracts_tarball_into_temp_dir(self):
-        patch_is_filesystem_file(self, False)
-        tarball = make_tarball_name()
-        temp_dir = self.make_dir()
-        image = make_image_name()
-        patch = self.patch(uec2roottar, 'extract_image_from_tarball')
-        patch.return_value = image
-        result = uec2roottar.get_image_file(tarball, temp_dir)
-        self.assertEqual(image, result)
-        self.assertThat(patch, MockCalledOnceWith(tarball, temp_dir))
-
-    def test__rejects_other_files(self):
-        patch_is_filesystem_file(self, False)
-        filename = factory.make_name('weird-file')
-        error = self.assertRaises(
-            uec2roottar.ImageFileError,
-            uec2roottar.get_image_file, filename, factory.make_name('dir'))
-        self.assertEqual(
-            "Expected '%s' to be either a filesystem file, or a "
-            "gzipped tarball containing one." % filename,
-            str(error))
-
-
-class TestUnmount(MAASTestCase):
-    """Tests for `unmount`."""
-
-    def test__calls_umount(self):
-        self.patch(uec2roottar, 'check_call')
-        mountpoint = factory.make_name('mount')
-        uec2roottar.unmount(mountpoint)
-        self.assertThat(
-            uec2roottar.check_call,
-            MockCalledOnceWith(['umount', mountpoint]))
-
-    def test__propagates_failure(self):
-        failure = CalledProcessError(9, factory.make_name('delibfail'))
-        self.patch(uec2roottar, 'check_call').side_effect = failure
-        self.patch(uec2roottar, 'maaslog')
-        mountpoint = factory.make_name('mount')
-        self.assertRaises(CalledProcessError, uec2roottar.unmount, mountpoint)
-        self.assertThat(
-            uec2roottar.maaslog.error,
-            MockCalledOnceWith(
-                "Could not unmount %s: %s", mountpoint, failure))
-
-
-class TestLoopMount(MAASTestCase):
-    """Tests for `loop_mount`."""
-
-    def test__mounts_and_unmounts_image(self):
-        image = make_image_name()
-        self.patch(uec2roottar, 'check_call')
-        mountpoint = factory.make_name('mount')
-
-        calls_before = len(uec2roottar.check_call.mock_calls)
-        with uec2roottar.loop_mount(image, mountpoint):
-            calls_during = len(uec2roottar.check_call.mock_calls)
-        calls_after = len(uec2roottar.check_call.mock_calls)
-
-        self.assertEqual(
-            (0, 1, 2),
-            (calls_before, calls_during, calls_after))
-        self.assertThat(
-            uec2roottar.check_call,
-            MockAnyCall(['mount', '-o', 'ro', image, mountpoint]))
-        self.assertThat(
-            uec2roottar.check_call,
-            MockAnyCall(['umount', mountpoint]))
-
-    def test__cleans_up_after_failure(self):
-        class DeliberateException(Exception):
-            pass
-
-        self.patch(uec2roottar, 'check_call')
-        image = make_image_name()
-        mountpoint = factory.make_name('mount')
-        with ExpectedException(DeliberateException):
-            with uec2roottar.loop_mount(image, mountpoint):
-                raise DeliberateException()
-
-        self.assertThat(
-            uec2roottar.check_call, MockAnyCall(['umount', mountpoint]))
-
-
-class TestTarSupportsXattrOpts(MAASTestCase):
-    """Tests for `tar_supports_xattr_opts`."""
-
-    def test__returns_True_if_help_contains_ref_to_xattr(self):
-        mock_check_call = self.patch(uec2roottar, 'check_output')
-        mock_check_call.return_value = b'xattr'
-        self.assertTrue(uec2roottar.tar_supports_xattr_opts())
-        self.assertThat(mock_check_call, MockCalledOnceWith(['tar', '--help']))
-
-    def test__returns_False_if_help_doesnt_contain_ref_to_xattr(self):
-        mock_check_call = self.patch(uec2roottar, 'check_output')
-        mock_check_call.return_value = b'nothing'
-        self.assertFalse(uec2roottar.tar_supports_xattr_opts())
-        self.assertThat(mock_check_call, MockCalledOnceWith(['tar', '--help']))
-
-
-class TestExtractImage(MAASTestCase):
-    """Tests for `extract_image`."""
-
-    def extract_command_line(self, call):
-        """Extract the command line from a `mock.call` for `check_call`."""
-        _, args, _ = call
-        [command] = args
-        return command
-
-    def test__extracts_image_if_tar_supports_xattr(self):
-        image = make_image_name()
-        output = make_tarball_name()
-        self.patch(uec2roottar, 'check_call')
-        self.patch(uec2roottar, 'tar_supports_xattr_opts').return_value = False
-        uec2roottar.extract_image(image, output)
-        self.assertThat(uec2roottar.check_call.mock_calls, HasLength(3))
-        [mount_call, tar_call, umount_call] = uec2roottar.check_call.mock_calls
-        self.assertEqual('mount', self.extract_command_line(mount_call)[0])
-        tar_command = self.extract_command_line(tar_call)
-        self.assertEqual(['tar', '-C'], tar_command[:2])
-        self.assertEqual('umount', self.extract_command_line(umount_call)[0])
-
-    def test__extracts_image_if_tar_doesnt_supports_xattr(self):
-        image = make_image_name()
-        output = make_tarball_name()
-        self.patch(uec2roottar, 'check_call')
-        self.patch(uec2roottar, 'tar_supports_xattr_opts').return_value = True
-        uec2roottar.extract_image(image, output)
-        self.assertThat(uec2roottar.check_call.mock_calls, HasLength(3))
-        [mount_call, tar_call, umount_call] = uec2roottar.check_call.mock_calls
-        self.assertEqual('mount', self.extract_command_line(mount_call)[0])
-        tar_command = self.extract_command_line(tar_call)
-        self.assertEqual(
-            ['tar', '--xattrs', '--xattrs-include=*', '-C'], tar_command[:4])
-        self.assertEqual('umount', self.extract_command_line(umount_call)[0])
-
-
-class TestSetOwnership(MAASTestCase):
-    """Tests for `set_ownership`."""
-
-    def test__does_nothing_if_no_user_specified(self):
-        self.patch(uec2roottar, 'check_call')
-        uec2roottar.set_ownership(make_tarball_name(), user=None)
-        self.assertThat(uec2roottar.check_call, MockNotCalled())
-
-    def test__calls_chown_if_user_specified(self):
-        self.patch(uec2roottar, 'check_call')
-        user = factory.make_name('user')
-        tarball = make_tarball_name()
-        uec2roottar.set_ownership(tarball, user=user)
-        self.assertThat(
-            uec2roottar.check_call,
-            MockCalledOnceWith(['/bin/chown', user, tarball]))
-
-
-class TestUEC2RootTar(MAASTestCase):
-    """Integration tests for `uec2roottar`."""
-
-    def make_args(self, **kwargs):
-        """Fake an `argparser` arguments object."""
-        args = mock.Mock()
-        for key, value in kwargs.items():
-            setattr(args, key, value)
-        return args
-
-    def test__integrates(self):
-        image_name = factory.make_name('root-image') + '.img'
-        image = self.make_file(name=image_name)
-        output_name = factory.make_name('root-tar') + '.tar.gz'
-        output = os.path.join(self.make_dir(), output_name)
-        args = self.make_args(image=image, output=output)
-        self.patch(uec2roottar, 'check_call')
-        self.patch(uec2roottar, 'check_output')
-        patch_is_filesystem_file(self, True)
-
-        uec2roottar.main(args)
-
-        self.assertThat(
-            uec2roottar.is_filesystem_file, MockCalledOnceWith(image))

=== removed file 'src/provisioningserver/import_images/uec2roottar.py'
--- src/provisioningserver/import_images/uec2roottar.py	2015-12-01 18:12:59 +0000
+++ src/provisioningserver/import_images/uec2roottar.py	1970-01-01 00:00:00 +0000
@@ -1,187 +0,0 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Code for the `uec2roottar` script."""
-
-__all__ = [
-    'main',
-    'make_argparser',
-    ]
-
-import argparse
-from contextlib import contextmanager
-from glob import glob
-import os.path
-from subprocess import (
-    check_call,
-    check_output,
-)
-
-from provisioningserver.logger import get_maas_logger
-from provisioningserver.utils.env import environment_variables
-from provisioningserver.utils.fs import tempdir
-
-
-maaslog = get_maas_logger("uec2roottar")
-
-
-def make_argparser(description):
-    """Create an `ArgumentParser` for this script."""
-    parser = argparse.ArgumentParser(description=description)
-    parser.add_argument(
-        'image', metavar='IMAGE-FILE', help="Input file: UEC root image.")
-    parser.add_argument(
-        'output', metavar='TARBALL', help="Output file: root tarball.")
-    parser.add_argument(
-        '--user', '-u', help="Set output file ownership to USER.")
-    return parser
-
-
-def is_filesystem_file(path):
-    """Does the file at `path` look like a filesystem-in-a-file?"""
-    # Identify filesystems using the "file" utility.  We'll be parsing the
-    # output, so suppress any translation.
-    with environment_variables({'LANG': 'C'}):
-        output = check_output(['file', path])
-    return b"filesystem data" in output
-
-
-class ImageFileError(Exception):
-    """Problem with the given image file."""
-
-
-def extract_image_from_tarball(tarball, working_dir):
-    """Extract image file from `tarball` into `working_dir`, return its path.
-
-    This may extract multiple files into `working_dir`; it looks for files with
-    names like `*.img`.  The function only succeeds, however, if there is
-    exactly one of those, in the tarball's root directory.
-    """
-    glob_pattern = '*.img'
-    maaslog.debug(
-        "Extracting %s from %s into %s.", glob_pattern, tarball, working_dir)
-    check_call([
-        'tar',
-        '-C', working_dir,
-        '--wildcards', glob_pattern,
-        '-Sxvzf', tarball,
-        ])
-    # Look for .img files.  Sort just so that if there is more than one image
-    # file, we'll produce a consistent error message.
-    candidates = sorted(glob(os.path.join(working_dir, glob_pattern)))
-    if len(candidates) == 0:
-        raise ImageFileError(
-            "Tarball %s does not contain any %s." % (tarball, glob_pattern))
-    if len(candidates) > 1:
-        raise ImageFileError(
-            "Tarball %s contains multiple image files: %s."
-            % (tarball, ', '.join(candidates)))
-    [image] = candidates
-    return image
-
-
-def get_image_file(path, temp_dir):
-    """Return image file at, or contained in tarball at, `path`.
-
-    :param path: Path to the image file.  Must point to either a file
-        containing a filesystem, or a tarball containing one, of the same
-        base name.
-    :param temp_dir: A temporary working directory.  If the image needs to be
-        extracted from a tarball, the tarball will be extracted here.
-    """
-    if is_filesystem_file(path):
-        # Easy.  This is the actual image file.
-        return path
-    elif path.endswith('.tar.gz'):
-        # Tarball.  Extract image file.
-        return extract_image_from_tarball(path, temp_dir)
-    else:
-        raise ImageFileError(
-            "Expected '%s' to be either a filesystem file, or "
-            "a gzipped tarball containing one." % path)
-
-
-def unmount(mountpoint):
-    """Unmount filesystem at given mount point.
-
-    If this fails, it logs the error as well as raising it.  This means that
-    error code paths can suppress the exception without depriving the user of
-    the information.
-    """
-    try:
-        check_call(['umount', mountpoint])
-    except BaseException as e:
-        maaslog.error("Could not unmount %s: %s", mountpoint, e)
-        raise
-
-
-@contextmanager
-def loop_mount(image, mountpoint):
-    """Context manager: temporarily loop-mount `image` at `mountpoint`."""
-    check_call(['mount', '-o', 'ro', image, mountpoint])
-    try:
-        yield
-    except:
-        try:
-            unmount(mountpoint)
-        except Exception:
-            # This is probably a secondary error resulting from the original
-            # problem.  Stick with the original exception.
-            pass
-        raise
-    else:
-        # Unmount after successful run.  If this fails, let the exception
-        # propagate.
-        unmount(mountpoint)
-
-
-def tar_supports_xattr_opts():
-    """Returns True if the system's tar supports the 'xattrs' options."""
-    out = check_output(['tar', '--help'])
-    return b"xattr" in out
-
-
-def extract_image(image, output):
-    """Loop-mount `image`, and tar its contents into `output`."""
-
-    xattr_opts = []
-    if tar_supports_xattr_opts():
-        # Only add the xattrs options if tar supports it.
-        # For insance tar on 12.04 does *not* support xattrs.
-        xattr_opts = ['--xattrs', '--xattrs-include=*']
-    with tempdir() as mountpoint:
-        cmd = ['tar'] + xattr_opts + [
-            # Work from mountpoint as the current directory.
-            '-C', mountpoint,
-            # Options:
-            #    -c: Create tarfile.
-            #    -p: Preserve permissions.
-            #    -S: Handle sparse files efficiently (images have those).
-            #    -z: Compress using gzip.
-            #    -f: Work on given tar file.
-            '-cpSzf', output,
-            '--numeric-owner',
-            # Tar up the "current directory": the mountpoint.
-            '.',
-            ]
-
-        with loop_mount(image, mountpoint):
-            check_call(cmd)
-
-
-def set_ownership(path, user=None):
-    """Set file ownership to `user` if specified."""
-    if user is not None:
-        maaslog.debug("Setting file owner to %s.", user)
-        check_call(['/bin/chown', user, path])
-
-
-def main(args):
-    """Do the work: loop-mount image, write contents to output file."""
-    output = args.output
-    maaslog.debug("Converting %s to %s.", args.image, output)
-    with tempdir() as working_dir:
-        image = get_image_file(args.image, working_dir)
-        extract_image(image, output)
-    set_ownership(output, args.user)
-    maaslog.debug("Finished.  Wrote to %s.", output)

=== modified file 'src/provisioningserver/kernel_opts.py'
--- src/provisioningserver/kernel_opts.py	2017-06-21 22:15:36 +0000
+++ src/provisioningserver/kernel_opts.py	2017-06-21 22:15:36 +0000
@@ -42,7 +42,6 @@
         "fs_host",      # Host/IP on which ephemeral filesystems are hosted.
         "extra_opts",   # String of extra options to supply, will be appended
                         # verbatim to the kernel command line
-        "http_boot",    # Whether or not to boot over HTTP.
         ))
 
 
@@ -72,56 +71,18 @@
     return max(dirs)
 
 
-ISCSI_TARGET_NAME_PREFIX = "iqn.2004-05.com.ubuntu:maas"
-
-
-def get_ephemeral_name(osystem, arch, subarch, release, label):
-    """Return the name of the most recent ephemeral image."""
-    return "ephemeral-%s-%s-%s-%s-%s" % (
-        osystem,
-        arch,
-        subarch,
-        release,
-        label
-        )
-
-
-def prefix_target_name(name):
-    """Prefix an ISCSI target name with the standard target-name prefix."""
-    return "%s:%s" % (ISCSI_TARGET_NAME_PREFIX, name)
-
-
 def compose_purpose_opts(params):
     """Return the list of the purpose-specific kernel options."""
-    if params.http_boot:
-        kernel_params = [
-            "root=squash:http://%s:5248/images/%s/%s/%s/%s/%s/squashfs" % (
-                (
-                    '[%s]' % params.fs_host
-                    if IPAddress(params.fs_host).version == 6
-                    else params.fs_host
-                ),
-                params.osystem, params.arch, params.subarch, params.release,
-                params.label),
-        ]
-    else:
-        tname = prefix_target_name(
-            get_ephemeral_name(
-                params.osystem, params.arch, params.subarch,
-                params.release, params.label))
-        kernel_params = [
-            # Read by the open-iscsi initramfs code.
-            "iscsi_target_name=%s" % tname,
-            "iscsi_target_ip=%s" % params.fs_host,
-            "iscsi_target_port=3260",
-            "iscsi_initiator=%s" % params.hostname,
-            # kernel / udev name iscsi devices with this path
-            "root=/dev/disk/by-path/ip-%s:%s-iscsi-%s-lun-1" % (
-                params.fs_host, "3260", tname),
-        ]
-
-    kernel_params += [
+    kernel_params = [
         "ro",
+        "root=squash:http://%s:5248/images/%s/%s/%s/%s/%s/squashfs" % (
+            (
+                '[%s]' % params.fs_host
+                if IPAddress(params.fs_host).version == 6
+                else params.fs_host
+            ),
+            params.osystem, params.arch, params.subarch, params.release,
+            params.label),
         # Read by cloud-initramfs-dyn-netconf initramfs-tools networking
         # configuration in the initramfs.  Choose IPv4 or IPv6 based on the
         # family of fs_host.  If BOOTIF is set, IPv6 config uses that

=== modified file 'src/provisioningserver/rpc/region.py'
--- src/provisioningserver/rpc/region.py	2017-06-21 22:15:36 +0000
+++ src/provisioningserver/rpc/region.py	2017-01-28 00:51:47 +0000
@@ -138,7 +138,6 @@
         (b"log_host", amp.Unicode()),
         (b"extra_opts", amp.Unicode()),
         (b"system_id", amp.Unicode(optional=True)),
-        (b"http_boot", amp.Boolean(optional=True)),
     ]
     errors = {
         BootConfigNoResponse: b"BootConfigNoResponse",

=== modified file 'src/provisioningserver/service_monitor.py'
--- src/provisioningserver/service_monitor.py	2016-10-17 19:19:44 +0000
+++ src/provisioningserver/service_monitor.py	2017-06-21 22:15:36 +0000
@@ -10,7 +10,6 @@
 from provisioningserver.rpc.exceptions import NoConnectionsAvailable
 from provisioningserver.rpc.region import GetControllerType
 from provisioningserver.utils.service_monitor import (
-    AlwaysOnService,
     Service,
     SERVICE_STATE,
     ServiceMonitor,
@@ -59,14 +58,6 @@
     snap_service_name = "dhcpd6"
 
 
-class TGTService(AlwaysOnService):
-    """Monitored tgt service."""
-
-    name = "tgt"
-    service_name = "tgt"
-    snap_service_name = "tgt"
-
-
 class NTPServiceOnRack(Service):
     """Monitored NTP service on a rack controller host."""
 
@@ -100,5 +91,4 @@
     DHCPv4Service(),
     DHCPv6Service(),
     NTPServiceOnRack(),
-    TGTService(),
 )

=== modified file 'src/provisioningserver/support_dump.py'
--- src/provisioningserver/support_dump.py	2016-06-06 09:01:44 +0000
+++ src/provisioningserver/support_dump.py	2017-06-21 22:15:36 +0000
@@ -91,9 +91,6 @@
         "title": "get_image_metadata()",
         "function": lambda *args: json.loads(get_image_metadata(*args))
     },
-    {
-        "command": "/usr/sbin/tgt-admin --show"
-    }
 ]
 
 

=== modified file 'src/provisioningserver/tests/test_kernel_opts.py'
--- src/provisioningserver/tests/test_kernel_opts.py	2017-06-21 22:15:36 +0000
+++ src/provisioningserver/tests/test_kernel_opts.py	2017-06-21 22:15:36 +0000
@@ -47,8 +47,6 @@
         {field: factory.make_name(field)
          for field in KernelParameters._fields
          if field not in parms})
-    if not isinstance(parms['http_boot'], bool):
-        parms['http_boot'] = True
     params = KernelParameters(**parms)
 
     if testcase is not None:
@@ -353,12 +351,3 @@
                 (
                     params.fs_host, params.osystem, params.arch,
                     params.subarch, params.release, params.label)]))
-
-    def test_compose_rootfs_over_iscsi(self):
-        params = make_kernel_parameters(
-            fs_host=factory.make_ipv6_address(), http_boot=False)
-        self.assertThat(
-            compose_kernel_command_line(params),
-            ContainsAll([
-                "root=/dev/disk/by-path/ip-",
-                "iscsi_initiator="]))

=== modified file 'src/provisioningserver/tests/test_service_monitor.py'
--- src/provisioningserver/tests/test_service_monitor.py	2017-01-28 00:51:47 +0000
+++ src/provisioningserver/tests/test_service_monitor.py	2017-06-21 22:15:36 +0000
@@ -21,7 +21,6 @@
     DHCPv6Service,
     NTPServiceOnRack,
     service_monitor,
-    TGTService,
 )
 from provisioningserver.utils.service_monitor import SERVICE_STATE
 from testtools.matchers import Equals
@@ -98,17 +97,6 @@
         self.assertEqual("maas-dhcpd6", service.service_name)
 
 
-class TestTGTService(MAASTestCase):
-
-    def test_service_name(self):
-        tgt = TGTService()
-        self.assertEqual("tgt", tgt.service_name)
-
-    def test_getExpectedState(self):
-        tgt = TGTService()
-        self.assertEqual((SERVICE_STATE.ON, None), tgt.getExpectedState())
-
-
 class TestNTPServiceOnRack(MAASTestCase):
 
     def test_name_and_service_name(self):
@@ -161,5 +149,5 @@
 
     def test__includes_all_services(self):
         self.assertItemsEqual(
-            ["dhcpd", "dhcpd6", "ntp_rack", "tgt"],
+            ["dhcpd", "dhcpd6", "ntp_rack"],
             service_monitor._services.keys())

=== modified file 'src/provisioningserver/tests/test_upgrade_cluster.py'
--- src/provisioningserver/tests/test_upgrade_cluster.py	2017-03-30 15:48:28 +0000
+++ src/provisioningserver/tests/test_upgrade_cluster.py	2017-06-21 22:15:36 +0000
@@ -344,20 +344,3 @@
                 os.path.join(
                     storage_dir, 'current', arch, subarch, release, label))
         return storage_dir
-
-    def test__calls_write_targets_conf_with_current_dir(self):
-        storage_dir = self.setup_working_migration_scenario()
-        mock_write = self.patch(upgrade_cluster, 'write_targets_conf')
-        self.patch(upgrade_cluster, 'update_targets_conf')
-        upgrade_cluster.migrate_architectures_into_ubuntu_directory()
-        self.assertThat(
-            mock_write,
-            MockCalledOnceWith(os.path.join(storage_dir, 'current')))
-
-    def test__calls_update_targets_conf_with_current_dir(self):
-        storage_dir = self.setup_working_migration_scenario()
-        mock_update = self.patch(upgrade_cluster, 'update_targets_conf')
-        upgrade_cluster.migrate_architectures_into_ubuntu_directory()
-        self.assertThat(
-            mock_update,
-            MockCalledOnceWith(os.path.join(storage_dir, 'current')))

=== modified file 'src/provisioningserver/upgrade_cluster.py'
--- src/provisioningserver/upgrade_cluster.py	2016-12-28 19:06:18 +0000
+++ src/provisioningserver/upgrade_cluster.py	2017-06-21 22:15:36 +0000
@@ -35,10 +35,6 @@
     list_subdirs,
 )
 from provisioningserver.config import ClusterConfiguration
-from provisioningserver.import_images.boot_resources import (
-    update_targets_conf,
-    write_targets_conf,
-)
 from provisioningserver.logger import get_maas_logger
 from provisioningserver.utils import snappy
 
@@ -192,11 +188,6 @@
     for arch in arches:
         shutil.move(os.path.join(current_dir, arch), ubuntu_dir)
 
-    # Re-write the maas.tgt to point to the new location for the ubuntu boot
-    # resources.
-    write_targets_conf(current_dir)
-    update_targets_conf(current_dir)
-
 
 # Upgrade hooks, from oldest to newest.  The hooks are callables, taking no
 # arguments.  They are called in order.