Merge lp:~allenap/maas/kill-all-the-configs-cluster into lp:~maas-committers/maas/trunk

[Gavin Panella]

Consolidate the local configuration for the cluster into a single file.

This is largely based on Nate's work which has already been reviewed,
but the changes I made warrant a new review from the ground up.

You can see from the diffstat - http://paste.ubuntu.com/11803857/ - that
the majority of this branch is small changes to many files, resulting in
a lot of context in the diff. The summary is:

 75 files changed, 726 insertions(+), 1968 deletions(-)

It's a fairly big change, but little of it is worth more than a moment's
contemplation, and the biggest overall change is removals.

[Andres Rodriguez (andreserl)]

Tested this, seems to be working just fine so +1

review: Approve

[MAAS Lander (maas-lander)]

The attempt to merge lp:~allenap/maas/kill-all-the-configs-cluster into lp:maas failed. Below is the output from the failed tests.

Ign http://security.ubuntu.com trusty-security InRelease
Get:1 http://security.ubuntu.com trusty-security Release.gpg [933 B]
Get:2 http://security.ubuntu.com trusty-security Release [63.5 kB]
Ign http://nova.clouds.archive.ubuntu.com trusty InRelease
Ign http://nova.clouds.archive.ubuntu.com trusty-updates InRelease
Hit http://nova.clouds.archive.ubuntu.com trusty Release.gpg
Get:3 http://nova.clouds.archive.ubuntu.com trusty-updates Release.gpg [933 B]
Hit http://nova.clouds.archive.ubuntu.com trusty Release
Get:4 http://nova.clouds.archive.ubuntu.com trusty-updates Release [63.5 kB]
Get:5 http://security.ubuntu.com trusty-security/main Sources [87.4 kB]
Get:6 http://security.ubuntu.com trusty-security/universe Sources [28.1 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty/main Sources
Get:7 http://security.ubuntu.com trusty-security/main amd64 Packages [304 kB]
Get:8 http://security.ubuntu.com trusty-security/universe amd64 Packages [111 kB]
Hit http://security.ubuntu.com trusty-security/main Translation-en
Hit http://security.ubuntu.com trusty-security/universe Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Sources
Hit http://nova.clouds.archive.ubuntu.com trusty/main amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/universe amd64 Packages
Hit http://nova.clouds.archive.ubuntu.com trusty/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en
Get:9 http://nova.clouds.archive.ubuntu.com trusty-updates/main Sources [212 kB]
Get:10 http://nova.clouds.archive.ubuntu.com trusty-updates/universe Sources [123 kB]
Get:11 http://nova.clouds.archive.ubuntu.com trusty-updates/main amd64 Packages [562 kB]
Get:12 http://nova.clouds.archive.ubuntu.com trusty-updates/universe amd64 Packages [292 kB]
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/main Translation-en
Hit http://nova.clouds.archive.ubuntu.com trusty-updates/universe Translation-en
Ign http://nova.clouds.archive.ubuntu.com trusty/main Translation-en_US
Ign http://nova.clouds.archive.ubuntu.com trusty/universe Translation-en_US
Fetched 1,848 kB in 4s (439 kB/s)
Reading package lists...
sudo DEBIAN_FRONTEND=noninteractive apt-get -y \
     --no-install-recommends install apache2 authbind bind9 bind9utils build-essential bzr-builddeb chromium-browser chromium-chromedriver curl daemontools debhelper dh-apport dh-systemd distro-info dnsutils firefox freeipmi-tools git gjs ipython isc-dhcp-common libjs-angularjs libjs-jquery libjs-jquery-hotkeys libjs-yui3-full libjs-yui3-min libpq-dev make nodejs-legacy npm pep8 phantomjs postgresql pyflakes python-apt python-bson python-bzrlib python-convoy python-coverage python-crochet python-cssselect python-curtin python-dev python-distro-info python-django python-django-piston python-django-south python-djorm-ext-pgarray python-docutils python-extras python-fixtures python-flake8 python-formencode python-hivex python-httplib2 python-iscpy python-jinja2 python-jsonschema python-lockfile python-lxml python-mock python-netaddr python-netif...

=== modified file '.bzrignore'
--- .bzrignore	2015-06-15 10:58:41 +0000
+++ .bzrignore	2015-07-03 11:18:28 +0000
@@ -24,8 +24,9 @@
 ./docs/_autosummary
 ./docs/_build
 ./docs/api.rst
+./eggs
+./etc/maas/clusterd.conf
 ./etc/maas/regiond.conf
-./eggs
 ./include
 ./lib
 ./local
@@ -35,6 +36,8 @@
 ./media/development
 ./parts
 ./run/*
+./run/etc/*
+./run/etc/maas/*
 ./services/*/introspect
 ./services/*/supervise
 ./src/maasserver/static/js/enums.js

=== modified file '.gitignore'
--- .gitignore	2015-04-10 09:45:46 +0000
+++ .gitignore	2015-07-03 11:18:28 +0000
@@ -4,6 +4,8 @@
 /.db.lock
 /.hypothesis
 /.idea
+/.idea/scopes
+/.idea/workspace.xml
 /.installed.cfg
 /.noseids
 /acceptance/*.build
@@ -23,6 +25,8 @@
 /docs/_build
 /docs/api.rst
 /eggs
+/etc/maas/clusterd.conf
+/etc/maas/regiond.conf
 /include
 /lib
 /local
@@ -32,6 +36,8 @@
 /media/development
 /parts
 /run/*
+/run/etc/*
+/run/etc/maas/*
 /services/*/introspect
 /services/*/supervise
 /src/maasserver/static/js/enums.js

=== modified file 'HACKING.txt'
--- HACKING.txt	2015-06-10 11:49:32 +0000
+++ HACKING.txt	2015-07-03 11:18:28 +0000
@@ -223,7 +223,7 @@
 you want to boot some real hardware. By default, it's set to start up on
 port 5244 for testing purposes. Make these changes::
 
-    * Edit ``etc/maas/pserv.yaml`` to change the tftp/port setting to 69
+    * Use ``bin/maas-provision`` to change the tftp-port setting to 69
     * Install the ``authbind``package:
 
       $ sudo apt-get install authbind

=== modified file 'INSTALL.txt'
--- INSTALL.txt	2015-05-22 14:59:47 +0000
+++ INSTALL.txt	2015-07-03 11:18:28 +0000
@@ -330,7 +330,7 @@
 
   * Initiate TCP connections (for HTTP) to each region controller on
     port 80 or port 5240, the choice of which depends on the setting of
-    ``MAAS_URL``.
+    the MAAS URL.
 
   * Initiate TCP connections (for RPC) to each region controller between
     port 5250 and 5259 inclusive. This permits up to 10 ``maas-regiond``

=== modified file 'Makefile'
--- Makefile	2015-06-16 21:10:26 +0000
+++ Makefile	2015-07-03 11:18:28 +0000
@@ -297,7 +297,7 @@
 clean-styles:
 	$(RM) $(scss_output)
 
-clean: stop
+clean: stop clean-run
 	$(MAKE) -C acceptance $@
 	find . -type f -name '*.py[co]' -print0 | xargs -r0 $(RM)
 	find . -type f -name '*~' -print0 | xargs -r0 $(RM)
@@ -316,7 +316,21 @@
 	$(RM) -r build dist logs/* parts
 	$(RM) tags TAGS .installed.cfg
 	$(RM) -r *.egg *.egg-info src/*.egg-info
-	$(RM) -r run/* run-e2e/* services/*/supervise
+	$(RM) -r services/*/supervise
+
+# Be selective about what to remove from run and run-e2e.
+define clean-run-template
+find $(1) -depth ! -type d \
+    ! -path $(1)/etc/maas/templates \
+    ! -path $(1)/etc/maas/drivers.yaml \
+    -print0 | xargs -r0 $(RM)
+find $(1) -depth -type d \
+    -print0 | xargs -r0 rmdir --ignore-fail-on-non-empty
+endef
+
+clean-run:
+	$(call clean-run-template,run)
+	$(call clean-run-template,run-e2e)
 
 clean+db: clean
 	$(RM) -r db
@@ -348,6 +362,7 @@
   check
   clean
   clean+db
+  clean-run
   clean-styles
   configure-buildout
   copyright

=== modified file 'buildout.cfg'
--- buildout.cfg	2015-06-15 10:58:41 +0000
+++ buildout.cfg	2015-07-03 11:18:28 +0000
@@ -46,7 +46,6 @@
   ${common:environment}
 environment =
   from os import environ
-  environ.setdefault("MAAS_CONFIG_DIR", "${buildout:directory}/etc/maas")
   environ.setdefault("MAAS_ROOT", "${buildout:directory}/run")
 warnings =
   from warnings import filterwarnings
@@ -77,7 +76,6 @@
   twistd.region=twisted.scripts.twistd:run
 initialization =
   ${common:initialization}
-  environ.setdefault("MAAS_REGION_CONFIG", "${buildout:directory}/etc/maas/regiond.conf")
   environ.setdefault("DJANGO_SETTINGS_MODULE", "maas.development")
 scripts =
   maas-region-admin
@@ -190,7 +188,6 @@
   twistd.cluster
 initialization =
   ${common:initialization}
-  environ.setdefault("MAAS_PROVISION_CMD", "${buildout:directory}/bin/maas-provision")
   environ.setdefault("MAAS_CLUSTER_DEVELOP", "TRUE")
 
 [cluster-test]

=== modified file 'docs/development/cluster-registration.rst'
--- docs/development/cluster-registration.rst	2015-02-19 21:49:54 +0000
+++ docs/development/cluster-registration.rst	2015-07-03 11:18:28 +0000
@@ -21,29 +21,9 @@
 Region Controller Location
 --------------------------
 
-The cluster obviously needs to know where the region controller is, and this is
-configured in a file ``/etc/maas/maas_cluster.conf`` (or
-``etc/demo_maas_cluster.conf`` for development environments).
-
-Cluster configuration file
---------------------------
-
-This config file generally contains two items like this::
-
-  MAAS_URL=http://0.0.0.0:5240/
-  CLUSTER_UUID="adfd3977-f251-4f2c-8d61-745dbd690bf2"
-
-The values here are the defaults in the development environment.  MAAS_URL
-tells the cluster controller where to find the region controller.
-
-``CLUSTER_UUID`` is what the region uses to tell clusters apart when they
-connect.  Each cluster is free to generate its own UUID but the development
-environment fixes it in advance.  The Ubuntu packaging generates a new UUID for
-a cluster controller each time it is installed.
-
-.. warning::
-  The format of this config file is very sensitive due to the code that parses
-  it.  It will not accept quoting, or any kind of comments.
+The cluster obviously needs to know where the region controller is, and
+this is configured in a file ``/etc/maas/clusterd.conf``. This should
+only ever be modified via the ``maas-provision`` command.
 
 .. _first-cluster:
 

=== removed file 'etc/demo_maas_cluster.conf'
--- etc/demo_maas_cluster.conf	2015-03-12 18:13:14 +0000
+++ etc/demo_maas_cluster.conf	1970-01-01 00:00:00 +0000
@@ -1,8 +0,0 @@
-# This is the version of maas_cluster.conf that's used when running from a
-# branch.  The region controller will serve HTTP on a different port from a
-# packaged MAAS, and the master cluster controller (running on the same
-# development machine) has a fixed UUID.
-# It is also carefully crafted so it works as both a bash script and a
-# Python script.
-MAAS_URL="http://0.0.0.0:5240/MAAS/"
-CLUSTER_UUID="adfd3977-f251-4f2c-8d61-745dbd690bf2"

=== removed file 'etc/maas/pserv.yaml'
--- etc/maas/pserv.yaml	2015-04-24 13:27:39 +0000
+++ etc/maas/pserv.yaml	1970-01-01 00:00:00 +0000
@@ -1,24 +0,0 @@
-##
-## Provisioning Server (pserv) configuration.
-##
-
-## Where to log. This log can be rotated by sending SIGUSR1 to the
-## running server.
-#
-# logfile: "pserv.log"
-logfile: "/dev/null"
-
-## TFTP configuration.
-#
-tftp:
-  # The "root" setting has been replaced by "resource_root".  The old setting
-  # is used one final time when upgrading a pre-14.04 cluster controller to a
-  # 14.04 version.  After that upgrade, it can be removed.
-  #
-  # resource_root: /var/lib/maas/boot-resources/current/
-
-  # port: 69
-  port: 5244
-  ## The URL to be contacted to generate PXE configurations.
-  # generator: http://localhost/MAAS/api/1.0/pxeconfig/
-  generator: http://localhost:5240/MAAS/api/1.0/pxeconfig/

=== removed file 'etc/maas_cluster.conf'
--- etc/maas_cluster.conf	2015-03-12 18:13:14 +0000
+++ etc/maas_cluster.conf	1970-01-01 00:00:00 +0000
@@ -1,5 +0,0 @@
-# This file is used by the cluster controller startup script:
-# `maas-provision start-cluster-controller`
-# to get the URL to the MAAS region controller's API. Normally, packaging
-# will update this file automatically but it may also be configured manually.
-MAAS_URL=http://localhost/MAAS

=== added directory 'run-e2e/etc'
=== added directory 'run-e2e/etc/maas'
=== added symlink 'run-e2e/etc/maas/drivers.yaml'
=== target is u'../../../etc/maas/drivers.yaml'
=== added symlink 'run-e2e/etc/maas/templates'
=== target is u'../../../etc/maas/templates'
=== added directory 'run/etc'
=== added directory 'run/etc/maas'
=== added symlink 'run/etc/maas/drivers.yaml'
=== target is u'../../../etc/maas/drivers.yaml'
=== added symlink 'run/etc/maas/templates'
=== target is u'../../../etc/maas/templates'
=== modified file 'services/clusterd/run'
--- services/clusterd/run	2015-05-29 16:47:37 +0000
+++ services/clusterd/run	2015-07-03 11:18:28 +0000
@@ -17,16 +17,18 @@
 # because there are race issues when restarting.
 [ -z "${logdir:-}" ] || exec &>> "${logdir}/current"
 
+# Configure the cluster's UUID to match sampledata, and also use a high
+# port for TFTP to match this branch's etc/services.
+bin/maas-provision config \
+    --uuid adfd3977-f251-4f2c-8d61-745dbd690bf2 \
+    --tftp-port 5244
+
+# Wait for the installation of the shared-secret.
+until bin/maas-provision check-for-shared-secret; do sleep 2; done
+
 # Exec the Provisioning Server.
 script="$(readlink -f bin/twistd.cluster)"
-config="$(readlink -f etc/maas/pserv.yaml)"
-
-# Obtain the development setting for CLUSTER_UUID.
-. etc/demo_maas_cluster.conf
-export CLUSTER_UUID
-export MAAS_URL
 
 exec $(command -v authbind && echo --deep) \
     "${script}" --nodaemon --pidfile="" maas-clusterd \
-    --introspect="unix:${here}/introspect:lockfile=0" \
-    --config-file "${config}"
+    --introspect="unix:${here}/introspect:lockfile=0"

=== modified file 'setup.py'
--- setup.py	2015-05-29 16:47:37 +0000
+++ setup.py	2015-07-03 11:18:28 +0000
@@ -64,9 +64,7 @@
 
     data_files=[
         ('/etc/maas',
-            ['etc/maas/pserv.yaml',
-             'etc/maas/drivers.yaml',
-             'etc/maas_cluster.conf',
+            ['etc/maas/drivers.yaml',
              'contrib/maas-http.conf']),
         ('/etc/maas/templates/uefi',
             glob('etc/maas/templates/uefi/*.template')),

=== modified file 'src/maas/demo.py'
--- src/maas/demo.py	2015-06-15 10:58:41 +0000
+++ src/maas/demo.py	2015-07-03 11:18:28 +0000
@@ -38,9 +38,6 @@
 
 MAAS_CLI = abspath("bin/maas-region-admin")
 
-# Use the in-branch development version of maas_cluster.conf.
-LOCAL_CLUSTER_CONFIG = abspath("etc/demo_maas_cluster.conf")
-
 # For demo purposes, give nodes unauthenticated access to their metadata
 # even if we can't pass boot parameters.  This is not safe; do not
 # enable it on a production MAAS.

=== modified file 'src/maas/development.py'
--- src/maas/development.py	2015-06-15 10:58:41 +0000
+++ src/maas/development.py	2015-07-03 11:18:28 +0000
@@ -95,14 +95,6 @@
 # Inject custom code for setting up the test database.
 patch_db_creation(abspath('db'), abspath('schema/baseline.sql'))
 
-# Override the default provisioning config filename.
-import provisioningserver.config
-provisioningserver.config.Config.DEFAULT_FILENAME = abspath(
-    "etc/maas/pserv.yaml")
-
-# Use the in-branch development version of maas_cluster.conf.
-LOCAL_CLUSTER_CONFIG = abspath("etc/demo_maas_cluster.conf")
-
 PASSWORD_HASHERS = (
     'django.contrib.auth.hashers.MD5PasswordHasher',
 )

=== modified file 'src/maas/settings.py'
--- src/maas/settings.py	2015-06-10 10:08:45 +0000
+++ src/maas/settings.py	2015-07-03 11:18:28 +0000
@@ -68,11 +68,6 @@
 # same model, so we silence the warnings that Piston gives.
 PISTON_IGNORE_DUPE_MODELS = True
 
-# Location of the local cluster config file (installed by
-# the package maas-cluster-controller).  Use to distinguish the local cluster
-# from the others.
-LOCAL_CLUSTER_CONFIG = "/etc/maas/maas_cluster.conf"
-
 TEMPLATE_DEBUG = DEBUG
 
 YUI_DEBUG = DEBUG

=== modified file 'src/maasserver/clusterrpc/tests/test_boot_images.py'
--- src/maasserver/clusterrpc/tests/test_boot_images.py	2015-05-29 16:47:37 +0000
+++ src/maasserver/clusterrpc/tests/test_boot_images.py	2015-07-03 11:18:28 +0000
@@ -45,11 +45,12 @@
     make_boot_image_storage_params,
     make_image,
 )
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from twisted.internet.defer import succeed
 
 
-def make_image_dir(image_params, tftproot):
-    """Fake a boot image matching `image_params` under `tftproot`."""
+def make_image_dir(image_params, tftp_root):
+    """Fake a boot image matching `image_params` under `tftp_root`."""
     image_dir = locate_tftp_path(
         compose_image_path(
             osystem=image_params['osystem'],
@@ -57,7 +58,7 @@
             subarch=image_params['subarchitecture'],
             release=image_params['release'],
             label=image_params['label']),
-        tftproot)
+        tftp_root)
     os.makedirs(image_dir)
     factory.make_file(image_dir, 'linux')
     factory.make_file(image_dir, 'initrd.gz')
@@ -136,16 +137,21 @@
         self.assertFalse(is_import_boot_images_running_for(nodegroup))
 
 
+def prepare_tftp_root(test):
+    """Create a `current` directory and configure its use."""
+    test.tftp_root = os.path.join(test.make_dir(), 'current')
+    os.mkdir(test.tftp_root)
+    test.patch(boot_images, 'CACHED_BOOT_IMAGES', None)
+    config = ClusterConfigurationFixture(tftp_root=test.tftp_root)
+    test.useFixture(config)
+
+
 class TestGetBootImages(MAASServerTestCase):
     """Tests for `get_boot_images`."""
 
     def setUp(self):
         super(TestGetBootImages, self).setUp()
-        resource_dir = self.make_dir()
-        self.tftproot = os.path.join(resource_dir, 'current')
-        os.mkdir(self.tftproot)
-        self.patch(boot_images, 'CACHED_BOOT_IMAGES', None)
-        self.patch(boot_images, 'BOOT_RESOURCES_STORAGE', resource_dir)
+        prepare_tftp_root(self)  # Sets self.tftp_root.
 
     def test_returns_boot_images(self):
         nodegroup = factory.make_NodeGroup(status=NODEGROUP_STATUS.ENABLED)
@@ -154,7 +160,7 @@
         purposes = ['install', 'commissioning', 'xinstall']
         params = [make_boot_image_storage_params() for _ in range(3)]
         for param in params:
-            make_image_dir(param, self.tftproot)
+            make_image_dir(param, self.tftp_root)
             test_tftppath.make_osystem(self, param['osystem'], purposes)
         self.assertItemsEqual(
             [
@@ -170,11 +176,7 @@
 
     def setUp(self):
         super(TestGetAvailableBootImages, self).setUp()
-        resource_dir = self.make_dir()
-        self.tftproot = os.path.join(resource_dir, 'current')
-        os.mkdir(self.tftproot)
-        self.patch(boot_images, 'CACHED_BOOT_IMAGES', None)
-        self.patch(boot_images, 'BOOT_RESOURCES_STORAGE', resource_dir)
+        prepare_tftp_root(self)  # Sets self.tftp_root.
 
     def test_returns_boot_images_for_one_cluster(self):
         factory.make_NodeGroup().accept()
@@ -183,7 +185,7 @@
         purposes = ['install', 'commissioning', 'xinstall']
         params = [make_boot_image_storage_params() for _ in range(3)]
         for param in params:
-            make_image_dir(param, self.tftproot)
+            make_image_dir(param, self.tftp_root)
             test_tftppath.make_osystem(self, param['osystem'], purposes)
         self.assertItemsEqual(
             [
@@ -260,17 +262,13 @@
 
     def setUp(self):
         super(TestGetBootImagesFor, self).setUp()
-        resource_dir = self.make_dir()
-        self.tftproot = os.path.join(resource_dir, 'current')
-        os.mkdir(self.tftproot)
-        self.patch(boot_images, 'CACHED_BOOT_IMAGES', None)
-        self.patch(boot_images, 'BOOT_RESOURCES_STORAGE', resource_dir)
+        prepare_tftp_root(self)  # Sets self.tftp_root.
 
     def make_boot_images(self):
         purposes = ['install', 'commissioning', 'xinstall']
         params = [make_boot_image_storage_params() for _ in range(3)]
         for param in params:
-            make_image_dir(param, self.tftproot)
+            make_image_dir(param, self.tftp_root)
             test_tftppath.make_osystem(self, param['osystem'], purposes)
         return params
 

=== modified file 'src/maasserver/config.py'
--- src/maasserver/config.py	2015-06-19 14:43:57 +0000
+++ src/maasserver/config.py	2015-07-03 11:18:28 +0000
@@ -25,6 +25,7 @@
     ConfigurationMeta,
     ConfigurationOption,
     ExtendedURL,
+    is_dev_environment,
 )
 
 
@@ -68,13 +69,3 @@
             return path.join(path.dirname(__file__), "static")
         else:
             return "/usr/share/maas/web/static"
-
-
-def is_dev_environment():
-    """Is this the development environment, or production?"""
-    try:
-        from maastesting import root  # noqa
-    except:
-        return False
-    else:
-        return True

=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2015-06-15 11:14:37 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2015-07-03 11:18:28 +0000
@@ -131,7 +131,7 @@
     call_responder,
 )
 from provisioningserver.rpc.testing.doubles import DummyConnection
-from provisioningserver.testing.config import set_tftp_root
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.utils import events
 from provisioningserver.utils.twisted import asynchronous
 from simplejson import dumps
@@ -362,7 +362,7 @@
             os.makedirs(os.path.join(tftpdir, *options))
 
         # Ensure that report_boot_images() uses the above TFTP file tree.
-        self.useFixture(set_tftp_root(tftpdir))
+        self.useFixture(ClusterConfigurationFixture(tftp_root=tftpdir))
 
         images = [
             {"architecture": arch, "subarchitecture": subarch,

=== modified file 'src/maasserver/tests/test_config.py'
--- src/maasserver/tests/test_config.py	2015-06-10 10:19:06 +0000
+++ src/maasserver/tests/test_config.py	2015-07-03 11:18:28 +0000
@@ -14,11 +14,8 @@
 __metaclass__ = type
 __all__ = []
 
-
-from maasserver import config
 from maasserver.config import RegionConfiguration
 from maastesting.factory import factory
-from maastesting.fixtures import ImportErrorFixture
 from maastesting.testcase import MAASTestCase
 
 
@@ -95,14 +92,3 @@
         self.assertEqual(example_value, getattr(config, self.option))
         # It's also stored in the configuration database.
         self.assertEqual({self.option: example_value}, config.store)
-
-
-class TestConfig(MAASTestCase):
-    """Tests for `maasserver.config`."""
-
-    def test_is_dev_environment_returns_false(self):
-        self.useFixture(ImportErrorFixture('maastesting', 'root'))
-        self.assertFalse(config.is_dev_environment())
-
-    def test_is_dev_environment_returns_true(self):
-        self.assertTrue(config.is_dev_environment())

=== modified file 'src/maasserver/utils/__init__.py'
--- src/maasserver/utils/__init__.py	2015-06-17 14:15:11 +0000
+++ src/maasserver/utils/__init__.py	2015-07-03 11:18:28 +0000
@@ -25,21 +25,22 @@
     'synchronised',
     ]
 
-import errno
 from functools import wraps
-import re
 from urllib import urlencode
 from urlparse import (
     urljoin,
     urlparse,
 )
 
-from django.conf import settings
 from django.core.urlresolvers import reverse
 from maasserver.config import RegionConfiguration
 from maasserver.enum import NODEGROUPINTERFACE_MANAGEMENT
 from maasserver.exceptions import NodeGroupMisconfiguration
 from maasserver.utils.orm import get_one
+from provisioningserver.config import (
+    ClusterConfiguration,
+    UUID_NOT_SET,
+)
 from provisioningserver.utils.text import make_bullet_list
 
 
@@ -150,22 +151,11 @@
 
 def get_local_cluster_UUID():
     """Return the UUID of the local cluster (or None if it cannot be found)."""
-    try:
-        cluster_config = open(settings.LOCAL_CLUSTER_CONFIG).read()
-        match = re.search(
-            "CLUSTER_UUID=(?P<quote>[\"']?)([^\"']+)(?P=quote)",
-            cluster_config)
-        if match is not None:
-            return match.groups()[1]
-        else:
-            return None
-    except IOError as error:
-        if error.errno == errno.ENOENT:
-            # Cluster config file is not present.
-            return None
-        else:
-            # Anything else is an error.
-            raise
+    with ClusterConfiguration.open() as config:
+        if config.cluster_uuid == UUID_NOT_SET:
+            return None
+        else:
+            return config.cluster_uuid
 
 
 def find_nodegroup(request):

=== modified file 'src/maasserver/utils/tests/test_utils.py'
--- src/maasserver/utils/tests/test_utils.py	2015-06-10 10:08:45 +0000
+++ src/maasserver/utils/tests/test_utils.py	2015-07-03 11:18:28 +0000
@@ -22,7 +22,6 @@
     urlparse,
 )
 
-from django.conf import settings
 from django.core.exceptions import ValidationError
 from django.core.urlresolvers import reverse
 from django.http import HttpRequest
@@ -49,6 +48,7 @@
 from maastesting.testcase import MAASTestCase
 from mock import sentinel
 from netaddr import IPAddress
+from provisioningserver.testing.config import ClusterConfigurationFixture
 
 
 class TestAbsoluteReverse(MAASServerTestCase):
@@ -231,20 +231,13 @@
 
 class TestGetLocalClusterUUID(MAASTestCase):
 
-    def test_get_local_cluster_UUID_returns_None_if_no_config_file(self):
-        bogus_file_name = '/tmp/bogus/%s' % factory.make_name('name')
-        self.patch(settings, 'LOCAL_CLUSTER_CONFIG', bogus_file_name)
-        self.assertIsNone(get_local_cluster_UUID())
-
-    def test_get_local_cluster_UUID_returns_None_if_parsing_fails(self):
-        file_name = self.make_file(contents="wrong content")
-        self.patch(settings, 'LOCAL_CLUSTER_CONFIG', file_name)
+    def test_get_local_cluster_UUID_returns_None_if_not_set(self):
+        self.useFixture(ClusterConfigurationFixture())
         self.assertIsNone(get_local_cluster_UUID())
 
     def test_get_local_cluster_UUID_returns_cluster_UUID(self):
         uuid = factory.make_UUID()
-        file_name = self.make_file(contents='CLUSTER_UUID="%s"' % uuid)
-        self.patch(settings, 'LOCAL_CLUSTER_CONFIG', file_name)
+        self.useFixture(ClusterConfigurationFixture(cluster_uuid=uuid))
         self.assertEqual(uuid, get_local_cluster_UUID())
 
 

=== modified file 'src/maastesting/protractor/runner.py'
--- src/maastesting/protractor/runner.py	2015-03-25 15:33:23 +0000
+++ src/maastesting/protractor/runner.py	2015-07-03 11:18:28 +0000
@@ -26,15 +26,13 @@
 from django.core.management import call_command
 from django.db import DEFAULT_DB_ALIAS
 from django.test.runner import setup_databases
-from fixtures import (
-    EnvironmentVariableFixture,
-    Fixture,
-)
+from fixtures import Fixture
 from maastesting.fixtures import (
     ChromiumWebDriverFixture,
     DisplayFixture,
 )
 from postgresfixture import ClusterFixture
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from testtools.monkey import patch
 from twisted.scripts import twistd
 
@@ -161,17 +159,12 @@
 class MAASClusterServiceFixture(Fixture):
     """Starts and stops the MAAS cluster service."""
 
-    MAAS_URL = "http://0.0.0.0:5253/MAAS/"
-    CLUSTER_UUID = "adfd3977-f251-4f2c-8d61-745dbd690bf2"
-    CONFIG_FILE = "src/maastesting/protractor.yaml"
-
     def setUp(self):
         """Start the clusterd service."""
         super(MAASClusterServiceFixture, self).setUp()
-        self.useFixture(EnvironmentVariableFixture(
-            "MAAS_URL", self.MAAS_URL))
-        self.useFixture(EnvironmentVariableFixture(
-            "CLUSTER_UUID", self.CLUSTER_UUID))
+        self.useFixture(ClusterConfigurationFixture(
+            cluster_uuid="adfd3977-f251-4f2c-8d61-745dbd690bf2",
+            maas_url="http://0.0.0.0:5253/MAAS/"))
 
         # Fork the process to have clusterd run in its own process.
         twistd_pid = os.fork()
@@ -180,13 +173,7 @@
             redirect_to_devnull()
 
             # Add command line options to start twistd.
-            sys.argv[1:] = [
-                "--nodaemon",
-                "--pidfile", "",
-                "maas-clusterd",
-                "--config-file",
-                self.CONFIG_FILE,
-                ]
+            sys.argv[1:] = ["--nodaemon", "--pidfile", "", "maas-clusterd"]
 
             # Start twistd.
             try:

=== modified file 'src/provisioningserver/__main__.py'
--- src/provisioningserver/__main__.py	2015-06-26 09:48:29 +0000
+++ src/provisioningserver/__main__.py	2015-07-03 11:18:28 +0000
@@ -18,7 +18,6 @@
 import provisioningserver.boot.install_bootloader
 import provisioningserver.boot.install_grub
 import provisioningserver.cluster_config_command
-import provisioningserver.configure_maas_url
 import provisioningserver.dhcp.writer
 import provisioningserver.upgrade_cluster
 from provisioningserver.utils.script import (
@@ -30,7 +29,6 @@
 script_commands = {
     'atomic-write': AtomicWriteScript,
     'check-for-shared-secret': security.CheckForSharedSecretScript,
-    'configure-maas-url': provisioningserver.configure_maas_url,
     'generate-dhcp-config': provisioningserver.dhcp.writer,
     'install-shared-secret': security.InstallSharedSecretScript,
     'install-uefi-config': provisioningserver.boot.install_grub,

=== modified file 'src/provisioningserver/boot/install_grub.py'
--- src/provisioningserver/boot/install_grub.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/boot/install_grub.py	2015-07-03 11:18:28 +0000
@@ -20,7 +20,7 @@
 import os.path
 
 from provisioningserver.boot.install_bootloader import make_destination
-from provisioningserver.config import Config
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.utils.fs import write_text_file
 
 
@@ -44,7 +44,7 @@
     """Install a GRUB2 pre-boot loader config into the TFTP
     directory structure.
     """
-    config = Config.load(args.config_file)
-    grubroot = os.path.join(config["tftp"]["resource_root"], 'grub')
-    destination_path = make_destination(grubroot)
-    write_text_file(os.path.join(destination_path, 'grub.cfg'), CONFIG_FILE)
+    with ClusterConfiguration.open() as config:
+        destination_path = make_destination(config.grub_root)
+        destination_file = os.path.join(destination_path, 'grub.cfg')
+    write_text_file(destination_file, CONFIG_FILE)

=== modified file 'src/provisioningserver/boot/tests/test_boot.py'
--- src/provisioningserver/boot/tests/test_boot.py	2015-06-11 21:21:22 +0000
+++ src/provisioningserver/boot/tests/test_boot.py	2015-07-03 11:18:28 +0000
@@ -118,9 +118,9 @@
 
     def make_fake_templates_dir(self, method):
         """Set up a fake templates dir, and return its path."""
-        fake_etc_maas = self.make_dir()
-        self.useFixture(EnvironmentVariableFixture(
-            'MAAS_CONFIG_DIR', fake_etc_maas))
+        fake_root = self.make_dir()
+        fake_etc_maas = os.path.join(fake_root, "etc", "maas")
+        self.useFixture(EnvironmentVariableFixture('MAAS_ROOT', fake_root))
         fake_templates = os.path.join(
             fake_etc_maas, 'templates/%s' % method.template_subdir)
         os.makedirs(fake_templates)

=== modified file 'src/provisioningserver/boot/tests/test_install_grub.py'
--- src/provisioningserver/boot/tests/test_install_grub.py	2015-04-09 16:21:27 +0000
+++ src/provisioningserver/boot/tests/test_install_grub.py	2015-07-03 11:18:28 +0000
@@ -20,7 +20,7 @@
 from maastesting.testcase import MAASTestCase
 import provisioningserver.boot.install_grub
 from provisioningserver.boot.tftppath import locate_tftp_path
-from provisioningserver.testing.config import set_tftp_root
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.utils.script import MainScript
 from testtools.matchers import FileExists
 
@@ -29,13 +29,12 @@
 
     def test_integration(self):
         tftproot = self.make_dir()
-        config_fixture = self.useFixture(set_tftp_root(tftproot))
+        self.useFixture(ClusterConfigurationFixture(tftp_root=tftproot))
 
         action = factory.make_name("action")
         script = MainScript(action)
         script.register(action, provisioningserver.boot.install_grub)
-        script.execute(
-            ("--config-file", config_fixture.filename, action))
+        script.execute((action,))
 
         config_filename = os.path.join('grub', 'grub.cfg')
         self.assertThat(

=== modified file 'src/provisioningserver/boot/tests/test_powernv.py'
--- src/provisioningserver/boot/tests/test_powernv.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/boot/tests/test_powernv.py	2015-07-03 11:18:28 +0000
@@ -19,6 +19,7 @@
 
 from maastesting.factory import factory
 from maastesting.testcase import MAASTestCase
+from mock import sentinel
 from provisioningserver.boot import (
     BytesReader,
     powernv as powernv_module,
@@ -32,7 +33,7 @@
 from provisioningserver.boot.tests.test_pxe import parse_pxe_config
 from provisioningserver.boot.tftppath import compose_image_path
 from provisioningserver.pserv_services.tftp import TFTPBackend
-from provisioningserver.testing.config import set_tftp_root
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
 from testtools.matchers import (
     IsInstance,
@@ -78,7 +79,7 @@
     def make_tftp_root(self):
         """Set, and return, a temporary TFTP root directory."""
         tftproot = self.make_dir()
-        self.useFixture(set_tftp_root(tftproot))
+        self.useFixture(ClusterConfigurationFixture(tftp_root=tftproot))
         return tftproot
 
     def test_compose_config_path_follows_maas_pxe_directory_layout(self):
@@ -255,7 +256,8 @@
         data = factory.make_string().encode("ascii")
         temp_file = self.make_file(name="example", contents=data)
         temp_dir = os.path.dirname(temp_file)
-        backend = TFTPBackend(temp_dir, "http://nowhere.example.com/")
+        backend = TFTPBackend(
+            temp_dir, "http://nowhere.example.com/", sentinel.uuid)
         method = PowerNVBootMethod()
         options = {
             'backend': backend,
@@ -274,7 +276,8 @@
         temp_subdir = os.path.join(temp_dir, 'ppc64el')
         os.mkdir(temp_subdir)
         factory.make_file(temp_subdir, "example", data)
-        backend = TFTPBackend(temp_dir, "http://nowhere.example.com/")
+        backend = TFTPBackend(
+            temp_dir, "http://nowhere.example.com/", sentinel.uuid)
         method = PowerNVBootMethod()
         options = {
             'backend': backend,

=== modified file 'src/provisioningserver/boot/tests/test_pxe.py'
--- src/provisioningserver/boot/tests/test_pxe.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/boot/tests/test_pxe.py	2015-07-03 11:18:28 +0000
@@ -34,7 +34,7 @@
     re_config_file,
 )
 from provisioningserver.boot.tftppath import compose_image_path
-from provisioningserver.testing.config import set_tftp_root
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
 from testtools.matchers import (
     Contains,
@@ -72,7 +72,7 @@
     def make_tftp_root(self):
         """Set, and return, a temporary TFTP root directory."""
         tftproot = self.make_dir()
-        self.useFixture(set_tftp_root(tftproot))
+        self.useFixture(ClusterConfigurationFixture(tftp_root=tftproot))
         return tftproot
 
     def make_dummy_bootloader_sources(self, destination, loader_names):

=== modified file 'src/provisioningserver/boot/tests/test_tftppath.py'
--- src/provisioningserver/boot/tests/test_tftppath.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/boot/tests/test_tftppath.py	2015-07-03 11:18:28 +0000
@@ -18,10 +18,8 @@
 import os.path
 
 from maastesting.factory import factory
-from maastesting.matchers import MockCalledOnceWith
 from maastesting.testcase import MAASTestCase
 from mock import Mock
-from provisioningserver import config
 from provisioningserver.boot import tftppath
 from provisioningserver.boot.tftppath import (
     compose_image_path,
@@ -48,7 +46,7 @@
     make_boot_image_storage_params,
     make_image,
 )
-from provisioningserver.testing.config import set_tftp_root
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.testing.os import make_osystem
 from testtools.matchers import (
     Not,
@@ -62,7 +60,7 @@
     def setUp(self):
         super(TestTFTPPath, self).setUp()
         self.tftproot = self.make_dir()
-        self.useFixture(set_tftp_root(self.tftproot))
+        self.useFixture(ClusterConfigurationFixture(tftp_root=self.tftproot))
 
     def make_image_dir(self, image_params, tftproot):
         """Fake a boot image matching `image_params` under `tftproot`."""
@@ -101,20 +99,12 @@
             os.path.join(self.tftproot, "maas.meta"))
         self.assertIsNone(observed)
 
-    def test_maas_meta_last_modified_defaults_tftproot(self):
-        path = factory.make_file(self.tftproot, name="maas.meta")
-        maas_meta_file_path = self.patch(tftppath, 'maas_meta_file_path')
-        maas_meta_file_path.return_value = path
-        maas_meta_last_modified()
-        expected_path = os.path.join(
-            config.BOOT_RESOURCES_STORAGE, 'current')
-        self.assertThat(maas_meta_file_path, MockCalledOnceWith(expected_path))
-
     def test_maas_meta_last_modified_reraises_non_ENOENT(self):
+        path = factory.make_file(self.tftproot, name="maas.meta")
         oserror = OSError()
         oserror.errno = errno.E2BIG
         self.patch(os.path, 'getmtime').side_effect = oserror
-        self.assertRaises(OSError, maas_meta_last_modified)
+        self.assertRaises(OSError, maas_meta_last_modified, path)
 
     def test_compose_image_path_follows_storage_directory_layout(self):
         osystem = factory.make_name('osystem')

=== modified file 'src/provisioningserver/boot/tests/test_windows.py'
--- src/provisioningserver/boot/tests/test_windows.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/boot/tests/test_windows.py	2015-07-03 11:18:28 +0000
@@ -41,9 +41,9 @@
     Bcd,
     WindowsPXEBootMethod,
 )
-from provisioningserver.config import Config
 from provisioningserver.rpc.exceptions import NoSuchNode
 from provisioningserver.rpc.region import RequestNodeInfoByMACAddress
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
 from testtools.deferredruntest import extract_result
 from testtools.matchers import Is
@@ -193,7 +193,6 @@
     run_tests_with = MAASTwistedRunTest.make_factory(timeout=5)
 
     def setUp(self):
-        self.patch(Config, 'load_from_cache')
         self.patch(windows_module, 'get_hivex_module')
         super(TestWindowsPXEBootMethod, self).setUp()
 
@@ -372,13 +371,8 @@
             BootMethodError, method.compose_bcd, kernel_params, local_host)
 
     def test_get_resouce_path(self):
-        fake_tftproot = factory.make_name('tftproot')
-        mock_config = self.patch(windows_module, 'Config')
-        mock_config.load_from_cache.return_value = {
-            'tftp': {
-                'resource_root': fake_tftproot,
-                },
-            }
+        fake_tftproot = self.make_dir()
+        self.useFixture(ClusterConfigurationFixture(tftp_root=fake_tftproot))
         method = WindowsPXEBootMethod()
         fake_path = factory.make_name('path')
         fake_kernelparams = make_kernel_parameters()

=== modified file 'src/provisioningserver/boot/tftppath.py'
--- src/provisioningserver/boot/tftppath.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/boot/tftppath.py	2015-07-03 11:18:28 +0000
@@ -23,7 +23,6 @@
 from itertools import chain
 import os.path
 
-from provisioningserver import config
 from provisioningserver.drivers.osystem import (
     BOOT_IMAGE_PURPOSE,
     OperatingSystemRegistry,
@@ -199,17 +198,14 @@
     return os.path.join(tftproot, 'maas.meta')
 
 
-def maas_meta_last_modified(tftproot=None):
+def maas_meta_last_modified(tftproot):
     """Return time of last modification of maas.meta.
 
     The time is the same as returned from getmtime() (seconds since epoch),
     or None if the file doesn't exist.
 
-    :param tftproot: Optional tftp root dir, defaults to
-        provisioningserver.config.BOOT_RESOURCES_STORAGE
+    :param tftproot: The TFTP root path.
     """
-    if tftproot is None:
-        tftproot = os.path.join(config.BOOT_RESOURCES_STORAGE, 'current')
     meta_file = maas_meta_file_path(tftproot)
     try:
         return os.path.getmtime(meta_file)

=== modified file 'src/provisioningserver/boot/windows.py'
--- src/provisioningserver/boot/windows.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/boot/windows.py	2015-07-03 11:18:28 +0000
@@ -28,7 +28,7 @@
     BytesReader,
     get_remote_mac,
 )
-from provisioningserver.config import Config
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.logger.log import get_maas_logger
 from provisioningserver.rpc import getRegionClient
 from provisioningserver.rpc.exceptions import NoSuchNode
@@ -300,7 +300,8 @@
 
     def get_resource_path(self, kernel_params, path):
         """Gets the resource path from the kernel param."""
-        resources = Config.load_from_cache()['tftp']['resource_root']
+        with ClusterConfiguration.open() as config:
+            resources = config.tftp_root
         return os.path.join(
             resources, 'windows', kernel_params.arch, kernel_params.subarch,
             kernel_params.release, kernel_params.label, path)

=== removed file 'src/provisioningserver/cluster_config.py'
--- src/provisioningserver/cluster_config.py	2015-04-09 16:21:27 +0000
+++ src/provisioningserver/cluster_config.py	1970-01-01 00:00:00 +0000
@@ -1,88 +0,0 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Accessors for cluster configuration as set in `maas_cluster.conf`."""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-)
-
-str = None
-
-__metaclass__ = type
-__all__ = [
-    'get_cluster_uuid',
-    'get_maas_url',
-    "get_cluster_variable",
-    "get_config_cluster_variable",
-    "set_config_cluster_variable", ]
-
-from os import environ
-
-from provisioningserver.config import ClusterConfiguration
-
-# List of configuration keys
-
-
-class CLUSTER_CONFIG:
-    DB_cluster_uuid = 'cluster_uuid'
-    DB_maas_url = 'maas_url'
-    DB_tftp_resource_root = "tftp_root"
-    DB_boot_resources_storage = "tftp_root"
-    DB_tftpport = 'tftp_port'
-
-
-# New get function for ClusterConfiguration backend
-def get_config_cluster_variable(var):
-    """Obtain the given environment variable from clusterd config"""
-    with ClusterConfiguration.open() as config:
-        return getattr(config, var)
-
-
-# Set function for ClusterConfiguration backend
-def set_config_cluster_variable(var, value):
-    """Set the given environment variable in clusterd config"""
-    with ClusterConfiguration.open() as config:
-        setattr(config, var, value)
-
-
-def get_tftp_generator():
-    """Return the `tftp_generator` setting, which is
-       <maas url>/api/1.0/pxeconfig/
-    """
-    return '/'.join(get_cluster_variable(CLUSTER_CONFIG.DB_maas_url),
-                    'api', '1.0', 'pxeconfig')
-
-
-# Old get function for config file (via env variables) backend,
-# to be removed in follow-up branch. This branch is a prerequisite branch for
-# a follow-up branch, where this function will be removed. Both
-# the new and old versions of this function have been included
-# in this intermediate branch at the request of the package
-# maintainers.
-def get_cluster_variable(var):
-    """Obtain the given environment variable from maas_cluster.conf.
-
-    If the variable is not set, it probably means that whatever script
-    started the current process neglected to run maas_cluster.conf.
-    In that case, fail helpfully but utterly.
-    """
-    value = environ.get(var)
-    if value is None:
-        raise AssertionError(
-            "%s is not set.  This probably means that the script which "
-            "started this program failed to source maas_cluster.conf."
-            % var)
-    return value
-
-
-def get_cluster_uuid():
-    """Return the `CLUSTER_UUID` setting."""
-    return get_cluster_variable('CLUSTER_UUID')
-
-
-def get_maas_url():
-    """Return the `MAAS_URL` setting."""
-    return get_cluster_variable('MAAS_URL')

=== modified file 'src/provisioningserver/cluster_config_command.py'
--- src/provisioningserver/cluster_config_command.py	2015-04-02 19:30:23 +0000
+++ src/provisioningserver/cluster_config_command.py	2015-07-03 11:18:28 +0000
@@ -21,12 +21,10 @@
 
 from uuid import uuid4
 
-from provisioningserver.cluster_config import (
-    CLUSTER_CONFIG,
-    get_config_cluster_variable,
-    set_config_cluster_variable,
+from provisioningserver.config import (
+    ClusterConfiguration,
+    UUID_NOT_SET,
 )
-from provisioningserver.config import UUID_NOT_SET
 
 
 def update_maas_cluster_conf(
@@ -44,28 +42,20 @@
     and init be passed at the same time, as these are mutually exclusive
     parameters.
     """
-
-    if url is not None:
-        set_config_cluster_variable(CLUSTER_CONFIG.DB_maas_url, url)
-
-    if uuid is not None:
-        set_config_cluster_variable(
-            CLUSTER_CONFIG.DB_cluster_uuid, uuid)
-
-    if init:
-        cur_uuid = get_config_cluster_variable(CLUSTER_CONFIG.DB_cluster_uuid)
-        if cur_uuid == UUID_NOT_SET:
-            set_config_cluster_variable(
-                CLUSTER_CONFIG.DB_cluster_uuid,
-                unicode(uuid4()))
-
-    if tftp_port is not None:
-        set_config_cluster_variable(CLUSTER_CONFIG.DB_tftpport, tftp_port)
-
-    if tftp_root is not None:
-        set_config_cluster_variable(
-            CLUSTER_CONFIG.DB_tftp_resource_root,
-            tftp_root)
+    with ClusterConfiguration.open() as config:
+        if url is not None:
+            config.maas_url = url
+        if uuid is not None:
+            config.cluster_uuid = uuid
+        if init:
+            cur_uuid = config.cluster_uuid
+            if cur_uuid == UUID_NOT_SET:
+                config.cluster_uuid = unicode(uuid4())
+        if tftp_port is not None:
+            config.tftp_port = tftp_port
+        if tftp_root is not None:
+            config.tftp_root = tftp_root
+
 
 all_arguments = (
     '--region-url',
@@ -101,11 +91,7 @@
 
 
 def run(args):
-    """Update MAAS_URL setting in configuration files.
-
-    For use by the MAAS packaging scripts.  Updates configuration data
-    store to reflect provided settings.
-    """
+    """Update configuration settings."""
     params = vars(args).copy()
     url = params.pop('region_url', None)
     uuid = params.pop('uuid', None)

=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2015-06-24 13:27:05 +0000
+++ src/provisioningserver/config.py	2015-07-03 11:18:28 +0000
@@ -1,45 +1,105 @@
 # Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""MAAS Provisioning Configuration.
-
-Configuration for most elements of a Cluster Controller can be obtained
-through this module's `Config` validator class. At the time of writing the
-exceptions are the `CLUSTER_UUID` and `MAAS_URL` environment variables (see
-`provisioningserver.cluster_config`).
-
-It's pretty simple. Typical usage is::
-
-  >>> config = Config.load_from_cache()
+"""Configuration for the MAAS cluster.
+
+This module also contains the common library code that's used for
+configuration in both the region and the cluster.
+
+There are two styles of configuration object, one older and deprecated, and
+one new.
+
+
+The Old Way
+-----------
+
+Configuration can be obtained through subclassing this module's `ConfigBase`
+validator class. It's pretty simple. Typical usage is::
+
+  >>> config = MyConfig.load_from_cache()
   {...}
 
-This reads in a configuration file from `Config.DEFAULT_FILENAME` (see a note
+This reads in a configuration file from `MyConfig.DEFAULT_FILENAME` (see a note
 about that later). The configuration file is parsed as YAML, and a plain `dict`
 is returned with configuration nested within it. The configuration is validated
 at load time using `formencode`. The policy for validation is laid out in this
 module; see the various `formencode.Schema` subclasses.
 
-All configuration is optional, and a sensible default is provided in every
-instance. When adding or changing settings bear this policy in mind, and also
-that the defaults should be geared towards a system in production, and not a
-development environment. The defaults can be obtained by calling
-`Config.get_defaults()`.
-
-An alternative to `Config.load_from_cache()` is `Config.load()`, which loads
-and validates a configuration file while bypassing the cache.  See `Config` for
-other useful functions.
-
-`Config.DEFAULT_FILENAME` is a class property, so does not need to be
-referenced via an instance of `Config`. It refers to the
-``MAAS_PROVISIONING_SETTINGS`` environment variable in the first instance, but
-has a sensible default too. You can write to this property and it will update
-the environment so that child processes will also use the same configuration
-filename. To revert to the default - i.e. erase the environment variable - you
-can `del Config.DEFAULT_FILENAME`.
-
-When testing, see `provisioningserver.testing.config.ConfigFixture` to
+Configuration should be optional, and a sensible default should be provided in
+every instance. The defaults can be obtained from `MyConfig.get_defaults()`.
+
+An alternative to `MyConfig.load_from_cache()` is `MyConfig.load()`, which
+loads and validates a configuration file while bypassing the cache. See
+`ConfigBase` for other useful functions.
+
+`MyConfig.DEFAULT_FILENAME` is a class property, so does not need to be
+referenced via an instance of `MyConfig`. It refers to an environment variable
+named by `MyConfig.envvar` in the first instance, but should have a sensible
+default too. You can write to this property and it will update the environment
+so that child processes will also use the same configuration filename. To
+revert to the default - i.e. erase the environment variable - you can `del
+MyConfig.DEFAULT_FILENAME`.
+
+When testing, see `provisioningserver.testing.config.ConfigFixtureBase` to
 temporarily use a different configuration.
 
+
+The New Way
+-----------
+
+There are two subclasses of this module's `Configuration` class, one for the
+region (`RegionConfiguration`) and for the cluster (`ClusterConfiguration`).
+Each defines a set of attributes which are the configuration variables:
+
+* If an attribute is declared as a `ConfigurationOption` then it's a
+  read-write configuration option, and should have a sensible default if
+  possible.
+
+* If an attribute is declared as a standard Python `property` then it's a
+  read-only configuration option.
+
+A metaclass is also defined, which must inherit from `ConfigurationMeta`, to
+define a few other important options:
+
+* ``default`` is the default filename for the configuration database.
+
+* ``envvar`` is the name of an environment variable that, if defined, provides
+  the filename for the configuration database. This is used in preference to
+  ``default``.
+
+* ``backend`` is a factory that provides the storage mechanism. Currently you
+  can choose from `ConfigurationFile` or `ConfigurationDatabase`. The latter
+  is strongly recommended in preference to the former.
+
+An example::
+
+  class MyConfiguration(Configuration):
+
+      class __metaclass__(ConfigurationMeta):
+          envvar = "CONFIG_FILE"
+          default = "/etc/myapp.conf"
+          backend = ConfigurationDatabase
+
+      images_dir = ConfigurationOption(
+          "images_dir", "The directory in which to store images.",
+          Directory(if_missing="/var/lib/myapp/images"))
+
+      @property
+      def png_dir(self):
+          "The directory in which to store PNGs."
+          return os.path.join(self.images_dir, "png")
+
+      @property
+      def gif_dir(self):
+          "The directory in which to store GIFs."
+          return os.path.join(self.images_dir, "gif")
+
+It can be used like so::
+
+  with MyConfiguration.open() as config:
+      config.images_dir = "/var/www/example.com/images"
+      print(config.png_dir, config.gif_dir)
+
 """
 
 from __future__ import (
@@ -52,11 +112,12 @@
 
 __metaclass__ = type
 __all__ = [
-    "BOOT_RESOURCES_STORAGE",
     "BootSources",
-    "Config",
+    "ClusterConfiguration",
     "ConfigBase",
     "ConfigMeta",
+    "is_dev_environment",
+    "UUID_NOT_SET",
 ]
 
 from contextlib import (
@@ -64,7 +125,6 @@
     contextmanager,
 )
 from copy import deepcopy
-from getpass import getuser
 import json
 import os
 from os import environ
@@ -82,11 +142,9 @@
 from formencode.api import NoDefault
 from formencode.declarative import DeclarativeMeta
 from formencode.validators import (
-    Int,
     Invalid,
     is_validator,
     Number,
-    RequireIfPresent,
     Set,
     String,
     UnicodeString,
@@ -100,11 +158,6 @@
 )
 import yaml
 
-# Path to the directory on the cluster controller where boot resources are
-# stored.  This used to be configurable in bootresources.yaml, and may become
-# configurable again in the future.
-BOOT_RESOURCES_STORAGE = '/var/lib/maas/boot-resources/'
-
 # Default result for cluster UUID if not set
 UUID_NOT_SET = '** UUID NOT SET **'
 
@@ -170,93 +223,6 @@
     ''', re.I | re.VERBOSE)
 
 
-class ConfigOops(Schema):
-    """Configuration validator for OOPS options.
-
-    Deprecated: MAAS no longer records OOPS reports. This remains here to
-    avoid validation failures when using old versions of the cluster's
-    configuration file.
-    """
-
-    if_key_missing = None
-
-    directory = String(if_missing=b"")
-    reporter = String(if_missing=b"")
-
-    chained_validators = (
-        RequireIfPresent("reporter", present="directory"),
-    )
-
-
-class ConfigBroker(Schema):
-    """Configuration validator for message broker options.
-
-    Deprecated: MAAS no longer uses a message broker. This remains here to
-    avoid validation failures when using old versions of the cluster's
-    configuration file.
-    """
-
-    if_key_missing = None
-
-    host = String(if_missing=b"localhost")
-    port = Int(min=1, max=65535, if_missing=5673)
-    username = String(if_missing=getuser())
-    password = String(if_missing=b"test")
-    vhost = String(if_missing="/")
-
-
-class ConfigTFTP(Schema):
-    """Configuration validator for the TFTP service."""
-
-    if_key_missing = None
-
-    # Obsolete: old TFTP root directory.  This is retained for the purpose of
-    # deriving new, Simplestreams-based import configuration from previously
-    # imported boot images.
-    # The last time this is needed is for upgrading an older cluster
-    # controller to the Ubuntu 14.04 version of MAAS.  After installation of
-    # the 14.04 version, this setting is never used.
-    root = String(if_missing="/var/lib/maas/tftp")
-
-    # TFTP root directory, managed by the Simplestreams-based import script.
-    # The import script maintains "current" as a symlink pointing to the most
-    # recent images.
-    # XXX jtv 2014-05-22: Redundant with BOOT_RESOURCES_STORAGE.
-    resource_root = String(
-        if_missing=os.path.join(BOOT_RESOURCES_STORAGE, 'current/'))
-
-    port = Int(min=1, max=65535, if_missing=69)
-    generator = String(if_missing=b"http://localhost/MAAS/api/1.0/pxeconfig/")
-
-
-class ConfigLegacyEphemeral(Schema):
-    """Legacy `ephemeral` section in `pserv.yaml` prior to MAAS 1.5.
-
-    This has been superseded by boot sources.
-    It is still accepted in `pserv.yaml`, but not used.
-    """
-    if_key_missing = None
-    images_directory = String(if_missing=None)
-    releases = Set(if_missing=None)
-
-
-class ConfigLegacyBoot(Schema):
-    """Legacy `boot` section in `pserv.yaml` prior to MAAS 1.5.
-
-    This has been superseded by boot sources.
-    It is still accepted in `pserv.yaml`, but not used.
-    """
-    if_key_missing = None
-    architectures = Set(if_missing=None)
-    ephemeral = ConfigLegacyEphemeral
-
-
-class ConfigRPC(Schema):
-    """Configuration validator for the RPC service."""
-
-    if_key_missing = None
-
-
 class BootSourceSelection(Schema):
     """Configuration validator for boot source selection configuration."""
 
@@ -403,23 +369,6 @@
             "`cls.envvar` in the environment."))
 
 
-class Config(ConfigBase, Schema):
-    """Configuration for the provisioning server."""
-
-    class __metaclass__(ConfigMeta):
-        envvar = "MAAS_PROVISIONING_SETTINGS"
-        default = "pserv.yaml"
-
-    if_key_missing = None
-
-    logfile = String(if_empty=b"pserv.log", if_missing=b"pserv.log")
-    oops = ConfigOops
-    broker = ConfigBroker
-    tftp = ConfigTFTP
-    rpc = ConfigRPC
-    boot = ConfigLegacyBoot
-
-
 class BootSources(ConfigBase, ForEach):
     """Configuration for boot sources."""
 
@@ -760,20 +709,42 @@
         default = "/etc/maas/clusterd.conf"
         backend = ConfigurationFile
 
-    # MAAS URL options
     maas_url = ConfigurationOption(
-        "maas_url", "The HTTP URL for the MAAS region.",
-        ExtendedURL(require_tld=False,
-                    if_missing="http://localhost:5240/MAAS"))
+        "maas_url", "The HTTP URL for the MAAS region.", ExtendedURL(
+            require_tld=False, if_missing="http://localhost:5240/MAAS"))
+
     # TFTP options.
     tftp_port = ConfigurationOption(
         "tftp_port", "The UDP port on which to listen for TFTP requests.",
         Number(min=0, max=(2 ** 16) - 1, if_missing=69))
     tftp_root = ConfigurationOption(
         "tftp_root", "The root directory for TFTP resources.",
-        Directory(if_missing="/var/lib/maas/boot-resources/current/"))
+        Directory(if_missing=get_tentative_path(
+            "/var/lib/maas/boot-resources/current")))
+
+    @property
+    def tftp_generator_url(self):
+        """The URL at which to obtain the TFTP options for a node."""
+        return "%s/api/1.0/pxeconfig/" % self.maas_url.rstrip("/")
+
+    # GRUB options.
+
+    @property
+    def grub_root(self):
+        "The root directory for GRUB resources."
+        return os.path.join(self.tftp_root, "grub")
 
     # Cluster UUID Option
     cluster_uuid = ConfigurationOption(
         "cluster_uuid", "The UUID for this cluster controller",
-        UUID(if_missing=unicode(UUID_NOT_SET)))
+        UUID(if_missing=UUID_NOT_SET))
+
+
+def is_dev_environment():
+    """Is this the development environment, or production?"""
+    try:
+        from maastesting import root  # noqa
+    except:
+        return False
+    else:
+        return True

=== removed file 'src/provisioningserver/configure_maas_url.py'
--- src/provisioningserver/configure_maas_url.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/configure_maas_url.py	1970-01-01 00:00:00 +0000
@@ -1,123 +0,0 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Management command: update `MAAS_URL`.
-
-The MAAS cluster controller packaging calls this in order to set a new
-"MAAS URL" (the URL where nodes and cluster controllers can reach the
-region controller) in the cluster controller's configuration files.
-"""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
-__all__ = [
-    'add_arguments',
-    'run',
-    ]
-
-from functools import partial
-import re
-from urlparse import urlparse
-
-from provisioningserver.utils.fs import (
-    atomic_write,
-    read_text_file,
-)
-from provisioningserver.utils.url import compose_URL
-
-
-MAAS_CLUSTER_CONF = '/etc/maas/maas_cluster.conf'
-
-PSERV_YAML = '/etc/maas/pserv.yaml'
-
-
-def rewrite_config_file(path, line_filter, mode=0600):
-    """Rewrite config file at `path` on a line-by-line basis.
-
-    Reads the file at `path`, runs its lines through `line_filter`, and
-    writes the result back to `path`.
-
-    Newlines may not be exactly as they were.  A trailing newline is ensured.
-
-    :param path: Path to the config file to be rewritten.
-    :param line_filter: A callable which accepts a line of input text (without
-        trailing newline), and returns the corresponding line of output text
-        (also without trailing newline).
-    :param mode: File access permissions for the newly written file.
-    """
-    input_lines = read_text_file(path).splitlines()
-    output_lines = [line_filter(line) for line in input_lines]
-    result = '%s\n' % '\n'.join(output_lines)
-    atomic_write(result, path, mode=mode)
-
-
-def update_maas_cluster_conf(url):
-    """Update `MAAS_URL` in `/etc/maas/maas_cluster.conf`.
-
-    This file contains a shell-style assignment of the `MAAS_URL`
-    variable.  Its assigned value will be changed to `url`.
-    """
-    substitute_line = lambda line: (
-        'MAAS_URL="%s"' % url
-        if re.match('\s*MAAS_URL=', line)
-        else line)
-    rewrite_config_file(MAAS_CLUSTER_CONF, substitute_line, mode=0640)
-
-
-def extract_host(url):
-    """Return just the host part of `url`."""
-    return urlparse(url).hostname
-
-
-def substitute_pserv_yaml_line(new_host, line):
-    match = re.match('(\s*generator:)\s+(\S*)(.*)$', line)
-    if match is None:
-        # Not the generator line.  Keep as-is.
-        return line
-    [head, input_url, tail] = match.groups()
-    return "%s %s%s" % (head, compose_URL(input_url, new_host), tail)
-
-
-def update_pserv_yaml(host):
-    """Update `generator` in `/etc/maas/pserv.yaml`.
-
-    This file contains a YAML line defining a `generator` URL.  The line must
-    look something like::
-
-        generator: http://10.9.8.7/MAAS/api/1.0/pxeconfig/
-
-    The host part of the URL (in this example, `10.9.8.7`) will be replaced
-    with the new `host`.  If `host` is an IPv6 address, this function will
-    ensure that it is surrounded by square brackets.
-    """
-    substitute_line = partial(substitute_pserv_yaml_line, host)
-    rewrite_config_file(PSERV_YAML, substitute_line, mode=0644)
-
-
-def add_arguments(parser):
-    """Add this command's options to the `ArgumentParser`.
-
-    Specified by the `ActionScript` interface.
-    """
-    parser.add_argument(
-        'maas_url', metavar='URL',
-        help=(
-            "URL where nodes and cluster controllers can reach the MAAS "
-            "region controller."))
-
-
-def run(args):
-    """Update MAAS_URL setting in configuration files.
-
-    For use by the MAAS packaging scripts.  Updates configuration files
-    to reflect a new MAAS_URL setting.
-    """
-    update_maas_cluster_conf(args.maas_url)
-    update_pserv_yaml(extract_host(args.maas_url))

=== modified file 'src/provisioningserver/dhcp/tests/test_config.py'
--- src/provisioningserver/dhcp/tests/test_config.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/dhcp/tests/test_config.py	2015-07-03 11:18:28 +0000
@@ -74,9 +74,9 @@
         """
         if name is None:
             name = 'dhcpd.conf.template'
-        fake_etc_maas = self.make_dir()
-        self.useFixture(EnvironmentVariableFixture(
-            'MAAS_CONFIG_DIR', fake_etc_maas))
+        fake_root = self.make_dir()
+        fake_etc_maas = path.join(fake_root, "etc", "maas")
+        self.useFixture(EnvironmentVariableFixture('MAAS_ROOT', fake_root))
         template_dir = path.join(fake_etc_maas, 'templates', 'dhcp')
         makedirs(template_dir)
         template = factory.make_file(

=== modified file 'src/provisioningserver/dhcp/tests/test_detect.py'
--- src/provisioningserver/dhcp/tests/test_detect.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/dhcp/tests/test_detect.py	2015-07-03 11:18:28 +0000
@@ -23,10 +23,7 @@
 
 from apiclient.maas_client import MAASClient
 from apiclient.testing.credentials import make_api_credentials
-from fixtures import (
-    EnvironmentVariable,
-    FakeLogger,
-)
+from fixtures import FakeLogger
 from maastesting.factory import factory
 from maastesting.matchers import MockCalledOnceWith
 from maastesting.testcase import MAASTestCase
@@ -48,6 +45,7 @@
     update_region_controller,
 )
 import provisioningserver.dhcp.detect as detect_module
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.testing.testcase import PservTestCase
 
 
@@ -343,7 +341,7 @@
             factory.make_string(),
             )
         api_credentials = make_api_credentials()
-        self.useFixture(EnvironmentVariable("MAAS_URL", maas_url))
+        self.useFixture(ClusterConfigurationFixture(maas_url=maas_url))
         self.knowledge = dict(
             nodegroup_uuid=uuid,
             api_credentials=api_credentials,

=== modified file 'src/provisioningserver/diskless.py'
--- src/provisioningserver/diskless.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/diskless.py	2015-07-03 11:18:28 +0000
@@ -20,12 +20,13 @@
 import os
 from textwrap import dedent
 
-from provisioningserver import config
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.drivers.diskless import DisklessDriverRegistry
 from provisioningserver.drivers.osystem import (
     BOOT_IMAGE_PURPOSE,
     OperatingSystemRegistry,
 )
+from provisioningserver.import_images.boot_resources import two_dir_levels_up
 from provisioningserver.logger import get_maas_logger
 from provisioningserver.utils.fs import (
     atomic_symlink,
@@ -47,8 +48,10 @@
     This is the location that all diskless links exist. It holds all of the
     currently in use disk for diskless booting.
     """
-    return os.path.join(
-        config.BOOT_RESOURCES_STORAGE, 'diskless', 'store')
+    with ClusterConfiguration.open() as config:
+        return os.path.join(
+            two_dir_levels_up(config.tftp_root),
+            'diskless', 'store')
 
 
 def compose_diskless_link_path(system_id):
@@ -99,8 +102,10 @@
 
 def get_diskless_tgt_path():
     """Return path to maas-diskless.tgt."""
-    return os.path.join(
-        config.BOOT_RESOURCES_STORAGE, 'diskless', 'maas-diskless.tgt')
+    with ClusterConfiguration.open() as config:
+        return os.path.join(
+            two_dir_levels_up(config.tftp_root),
+            'diskless', 'maas-diskless.tgt')
 
 
 def tgt_entry(system_id, image):
@@ -153,7 +158,7 @@
     symlinks in the diskless store. Reloads the tgt config."""
     tgt_path = get_diskless_tgt_path()
     tgt_config = compose_diskless_tgt_config()
-    atomic_write(tgt_config, tgt_path, mode=0644)
+    atomic_write(tgt_config, tgt_path, mode=0o644)
     reload_diskless_tgt()
 
 
@@ -183,9 +188,10 @@
         raise DisklessError(
             "OS doesn't support diskless booting: %s" % osystem_name)
     root_path, _ = osystem.get_xinstall_parameters()
-    return os.path.join(
-        config.BOOT_RESOURCES_STORAGE, 'current',
-        osystem_name, arch, subarch, release, label, root_path)
+    with ClusterConfiguration.open() as config:
+        return os.path.join(
+            config.tftp_root, osystem_name, arch, subarch, release, label,
+            root_path)
 
 
 def create_diskless_disk(driver, driver_options, system_id,

=== modified file 'src/provisioningserver/drivers/osystem/custom.py'
--- src/provisioningserver/drivers/osystem/custom.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/drivers/osystem/custom.py	2015-07-03 11:18:28 +0000
@@ -18,7 +18,7 @@
 
 import os
 
-from provisioningserver.config import BOOT_RESOURCES_STORAGE
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.drivers.osystem import (
     BOOT_IMAGE_PURPOSE,
     OperatingSystem,
@@ -55,10 +55,11 @@
 
     def get_xinstall_parameters(self, arch, subarch, release, label):
         """Returns the xinstall image name and type for given image."""
-        path = os.path.join(
-            BOOT_RESOURCES_STORAGE, 'current', 'custom',
-            arch, subarch, release, label)
-        if os.path.exists(os.path.join(path, 'root-dd')):
+        with ClusterConfiguration.open() as config:
+            dd_path = os.path.join(
+                config.tftp_root, 'custom', arch,
+                subarch, release, label, 'root-dd')
+        if os.path.exists(dd_path):
             return "root-dd", "dd-tgz"
         else:
             return "root-tgz", "tgz"

=== modified file 'src/provisioningserver/drivers/osystem/tests/test_custom.py'
--- src/provisioningserver/drivers/osystem/tests/test_custom.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/drivers/osystem/tests/test_custom.py	2015-07-03 11:18:28 +0000
@@ -19,26 +19,30 @@
 
 from maastesting.factory import factory
 from maastesting.testcase import MAASTestCase
-from provisioningserver.drivers.osystem import custom
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.drivers.osystem.custom import (
     BOOT_IMAGE_PURPOSE,
     CustomOS,
 )
+from provisioningserver.testing.config import ClusterConfigurationFixture
 
 
 class TestCustomOS(MAASTestCase):
 
     def make_resource_path(self, filename):
+        self.useFixture(ClusterConfigurationFixture())
         tmpdir = self.make_dir()
         arch = factory.make_name('arch')
         subarch = factory.make_name('subarch')
         release = factory.make_name('release')
         label = factory.make_name('label')
+        current_dir = os.path.join(tmpdir, 'current') + '/'
         dirpath = os.path.join(
-            tmpdir, 'current', 'custom', arch, subarch, release, label)
+            current_dir, 'custom', arch, subarch, release, label)
         os.makedirs(dirpath)
         factory.make_file(dirpath, filename)
-        self.patch(custom, 'BOOT_RESOURCES_STORAGE', tmpdir)
+        with ClusterConfiguration.open() as config:
+            config.tftp_root = current_dir
         return arch, subarch, release, label
 
     def test_get_boot_image_purposes(self):

=== modified file 'src/provisioningserver/drivers/osystem/tests/test_windows.py'
--- src/provisioningserver/drivers/osystem/tests/test_windows.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/drivers/osystem/tests/test_windows.py	2015-07-03 11:18:28 +0000
@@ -25,12 +25,12 @@
 )
 from provisioningserver.drivers.osystem.windows import (
     BOOT_IMAGE_PURPOSE,
-    Config,
     REQUIRE_LICENSE_KEY,
     WINDOWS_CHOICES,
     WINDOWS_DEFAULT,
     WindowsOS,
 )
+from provisioningserver.testing.config import ClusterConfigurationFixture
 
 
 class TestWindowsOS(MAASTestCase):
@@ -46,11 +46,7 @@
         os.makedirs(dirpath)
         for fname in files:
             factory.make_file(dirpath, fname)
-        self.patch(Config, 'load_from_cache').return_value = {
-            'tftp': {
-                'resource_root': tmpdir,
-                },
-            }
+        self.useFixture(ClusterConfigurationFixture(tftp_root=tmpdir))
         return arch, subarch, release, label
 
     def test_get_boot_image_purposes_neither(self):

=== modified file 'src/provisioningserver/drivers/osystem/windows.py'
--- src/provisioningserver/drivers/osystem/windows.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/drivers/osystem/windows.py	2015-07-03 11:18:28 +0000
@@ -19,7 +19,7 @@
 import os
 import re
 
-from provisioningserver.config import Config
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.drivers.osystem import (
     BOOT_IMAGE_PURPOSE,
     OperatingSystem,
@@ -51,7 +51,8 @@
         # is available the node will boot correctly, even if fast-path
         # installer is not selected.
         purposes = []
-        resources = Config.load_from_cache()['tftp']['resource_root']
+        with ClusterConfiguration.open() as config:
+            resources = config.tftp_root
         path = os.path.join(
             resources, 'windows', arch, subarch, release, label)
         if os.path.exists(os.path.join(path, 'root-dd')):

=== modified file 'src/provisioningserver/import_images/boot_resources.py'
--- src/provisioningserver/import_images/boot_resources.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/import_images/boot_resources.py	2015-07-03 11:18:28 +0000
@@ -22,10 +22,12 @@
 import os
 from textwrap import dedent
 
-import provisioningserver
 from provisioningserver.boot import BootMethodRegistry
 from provisioningserver.boot.tftppath import list_boot_images
-from provisioningserver.config import BootSources
+from provisioningserver.config import (
+    BootSources,
+    ClusterConfiguration,
+)
 from provisioningserver.import_images.cleanup import (
     cleanup_snapshots_and_cache,
 )
@@ -39,7 +41,6 @@
 from provisioningserver.import_images.keyrings import write_all_keyrings
 from provisioningserver.import_images.product_mapping import map_products
 from provisioningserver.service_monitor import service_monitor
-from provisioningserver.utils import get_cluster_config
 from provisioningserver.utils.fs import (
     atomic_symlink,
     atomic_write,
@@ -49,6 +50,16 @@
 from provisioningserver.utils.shell import call_and_check
 
 
+def two_dir_levels_up(path):
+    # NOTE: Syntax along the lines of:
+    #    os.path.normpath(os.path.join(
+    #       path, os.path.pardir, os.path.pardir))
+    # will NOT work here, as the classes that use these file paths
+    # to NOT support paths with 'os.path.pardir' segments. Thus
+    # we must manually resolve the path here.
+    return os.path.split(os.path.split(path)[0])[0]
+
+
 class NoConfigFile(Exception):
     """Raised when the config file for the script doesn't exist."""
 
@@ -250,7 +261,8 @@
                 "any boot images available.")
             return
 
-        storage = provisioningserver.config.BOOT_RESOURCES_STORAGE
+        with ClusterConfiguration.open() as config:
+            storage = two_dir_levels_up(config.tftp_root)
         meta_file_content = image_descriptions.dump_json()
         if meta_contains(storage, meta_file_content):
             maaslog.info(
@@ -359,10 +371,6 @@
         finally:
             reactor.callLater(0, reactor.stop)
 
-    cluster_config = get_cluster_config('/etc/maas/maas_cluster.conf')
-    os.environ['MAAS_URL'] = cluster_config['MAAS_URL']
-    os.environ['CLUSTER_UUID'] = cluster_config['CLUSTER_UUID']
-
     reactor.callWhenRunning(run_main)
     reactor.run()
 

=== modified file 'src/provisioningserver/import_images/tests/test_boot_resources.py'
--- src/provisioningserver/import_images/tests/test_boot_resources.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/import_images/tests/test_boot_resources.py	2015-07-03 11:18:28 +0000
@@ -40,14 +40,19 @@
 import mock
 from mock import call
 from provisioningserver.boot import BootMethodRegistry
-import provisioningserver.config
-from provisioningserver.config import BootSources
+from provisioningserver.config import (
+    BootSources,
+    ClusterConfiguration,
+)
 from provisioningserver.import_images import boot_resources
 from provisioningserver.import_images.boot_image_mapping import (
     BootImageMapping,
 )
 from provisioningserver.import_images.testing.factory import make_image_spec
-from provisioningserver.testing.config import BootSourcesFixture
+from provisioningserver.testing.config import (
+    BootSourcesFixture,
+    ClusterConfigurationFixture,
+)
 from provisioningserver.utils.fs import write_text_file
 from testtools.content import Content
 from testtools.content_type import UTF8_TEXT
@@ -196,9 +201,13 @@
 
     def setUp(self):
         super(TestMain, self).setUp()
+        self.useFixture(ClusterConfigurationFixture())
         self.storage = self.make_dir()
-        self.patch(
-            provisioningserver.config, 'BOOT_RESOURCES_STORAGE', self.storage)
+        current_dir = os.path.join(self.storage, 'current') + os.sep
+        os.makedirs(current_dir)
+        with ClusterConfiguration.open() as config:
+            config.tftp_root = current_dir
+        os.rmdir(current_dir)
         # Forcing arch to amd64 causes pxelinux.0 to be installed, giving more
         # test coverage.
         self.image = make_image_spec(arch='amd64')

=== modified file 'src/provisioningserver/path.py'
--- src/provisioningserver/path.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/path.py	2015-07-03 11:18:28 +0000
@@ -22,6 +22,17 @@
 from provisioningserver.utils.fs import ensure_dir
 
 
+def get_root():
+    """Return ``MAAS_ROOT`` if set, else "/"."""
+    root = os.getenv('MAAS_ROOT')
+    if root is None:
+        return "/"
+    elif len(root) == 0:
+        return "/"
+    else:
+        return root
+
+
 def get_tentative_path(*path_elements):
     """Return an absolute path based on the `MAAS_ROOT` environment variable.
 
@@ -44,12 +55,12 @@
     holds your path, export a getter function that returns your path. Add
     caching if it becomes a performance problem.
     """
-    maas_root = os.getenv('MAAS_ROOT', '/')
-    # Strip off a leading slash, if any.  If left in, it would override any
-    # preceding path elements.  The MAAS_ROOT would be ignored.
-    # The dot is there to make the call work even with zero path elements.
+    # Strip off a leading slash from the given path, if any. If it were left
+    # in, it would override preceding path elements and MAAS_ROOT would be
+    # ignored later on. The dot is there to make the call work even with zero
+    # path elements.
     path = os.path.join('.', *path_elements).lstrip('/')
-    path = os.path.join(maas_root, path)
+    path = os.path.join(get_root(), path)
     return os.path.abspath(path)
 
 

=== modified file 'src/provisioningserver/plugin.py'
--- src/provisioningserver/plugin.py	2015-06-25 14:48:14 +0000
+++ src/provisioningserver/plugin.py	2015-07-03 11:18:28 +0000
@@ -17,10 +17,10 @@
 ]
 
 from errno import ENOPROTOOPT
-import os
 import socket
 from socket import error as socket_error
 
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.monkey import (
     add_term_error_code_to_tftp,
     force_simplestreams_to_use_urllib2,
@@ -48,7 +48,6 @@
     """Command line options for the provisioning server."""
 
     optParameters = [
-        ["config-file", "c", "pserv.yaml", "Configuration file to load."],
         ["introspect", None, None,
          ("Allow introspection, allowing unhindered access to the internals "
           "of MAAS. This should probably only be used for debugging. Supply "
@@ -79,12 +78,10 @@
         site_service.setName("site")
         return site_service
 
-    def _makeImageService(self):
+    def _makeImageService(self, resource_root):
         from provisioningserver.pserv_services.image import (
             BootImageEndpointService)
         from twisted.internet.endpoints import AdoptedStreamServerEndpoint
-        from provisioningserver import config
-
         port = 5248  # config["port"]
         # Make a socket with SO_REUSEPORT set so that we can run multiple we
         # applications. This is easier to do from outside of Twisted as there's
@@ -112,59 +109,54 @@
         site_endpoint.socket = s  # Prevent garbage collection.
 
         image_service = BootImageEndpointService(
-            resource_root=os.path.join(
-                config.BOOT_RESOURCES_STORAGE, "current"),
-            endpoint=site_endpoint)
+            resource_root=resource_root, endpoint=site_endpoint)
         image_service.setName("image_service")
         return image_service
 
-    def _makeTFTPService(self, tftp_config):
+    def _makeTFTPService(
+            self, cluster_uuid, tftp_root, tftp_port, tftp_generator):
         """Create the dynamic TFTP service."""
         from provisioningserver.pserv_services.tftp import TFTPService
         tftp_service = TFTPService(
-            resource_root=tftp_config['resource_root'],
-            port=tftp_config['port'], generator=tftp_config['generator'])
+            resource_root=tftp_root, port=tftp_port, generator=tftp_generator,
+            uuid=cluster_uuid)
         tftp_service.setName("tftp")
         return tftp_service
 
-    def _makeImageDownloadService(self, rpc_service):
-        from provisioningserver.cluster_config import get_cluster_uuid
+    def _makeImageDownloadService(self, rpc_service, cluster_uuid, tftp_root):
         from provisioningserver.pserv_services.image_download_service \
             import ImageDownloadService
         image_download_service = ImageDownloadService(
-            rpc_service, reactor, get_cluster_uuid())
+            rpc_service, cluster_uuid, tftp_root, reactor)
         image_download_service.setName("image_download")
         return image_download_service
 
-    def _makeLeaseUploadService(self, rpc_service):
-        from provisioningserver.cluster_config import get_cluster_uuid
+    def _makeLeaseUploadService(self, rpc_service, cluster_uuid):
         from provisioningserver.pserv_services.lease_upload_service \
             import LeaseUploadService
         lease_upload_service = LeaseUploadService(
-            rpc_service, reactor, get_cluster_uuid())
+            rpc_service, reactor, cluster_uuid)
         lease_upload_service.setName("lease_upload")
         return lease_upload_service
 
-    def _makeNodePowerMonitorService(self):
-        from provisioningserver.cluster_config import get_cluster_uuid
+    def _makeNodePowerMonitorService(self, cluster_uuid):
         from provisioningserver.pserv_services.node_power_monitor_service \
             import NodePowerMonitorService
-        node_monitor = NodePowerMonitorService(get_cluster_uuid(), reactor)
+        node_monitor = NodePowerMonitorService(cluster_uuid, reactor)
         node_monitor.setName("node_monitor")
         return node_monitor
 
-    def _makeRPCService(self, rpc_config):
+    def _makeRPCService(self):
         from provisioningserver.rpc.clusterservice import ClusterClientService
         rpc_service = ClusterClientService(reactor)
         rpc_service.setName("rpc")
         return rpc_service
 
-    def _makeDHCPProbeService(self, rpc_service):
-        from provisioningserver.cluster_config import get_cluster_uuid
+    def _makeDHCPProbeService(self, rpc_service, cluster_uuid):
         from provisioningserver.pserv_services.dhcp_probe_service \
             import DHCPProbeService
         dhcp_probe_service = DHCPProbeService(
-            rpc_service, reactor, get_cluster_uuid())
+            rpc_service, reactor, cluster_uuid)
         dhcp_probe_service.setName("dhcp_probe")
         return dhcp_probe_service
 
@@ -183,6 +175,23 @@
         introspect_service.setName("introspect")
         return introspect_service
 
+    def _makeServices(self, config):
+        # Several services need to make use of the RPC service.
+        rpc_service = self._makeRPCService()
+        yield rpc_service
+        # Other services that make up the MAAS Region Controller.
+        yield self._makeDHCPProbeService(rpc_service, config.cluster_uuid)
+        yield self._makeLeaseUploadService(rpc_service, config.cluster_uuid)
+        yield self._makeNodePowerMonitorService(config.cluster_uuid)
+        yield self._makeServiceMonitorService()
+        yield self._makeImageDownloadService(
+            rpc_service, config.cluster_uuid, config.tftp_root)
+        # The following are network-accessible services.
+        yield self._makeImageService(config.tftp_root)
+        yield self._makeTFTPService(
+            config.cluster_uuid, config.tftp_root, config.tftp_port,
+            config.tftp_generator_url)
+
     def makeService(self, options):
         """Construct the MAAS Cluster service."""
         register_sigusr2_thread_dump_handler()
@@ -190,33 +199,9 @@
         add_term_error_code_to_tftp()
 
         from provisioningserver import services
-        from provisioningserver.config import Config
-
-        config = Config.load(options["config-file"])
-
-        image_service = self._makeImageService()
-        image_service.setServiceParent(services)
-
-        tftp_service = self._makeTFTPService(config["tftp"])
-        tftp_service.setServiceParent(services)
-
-        rpc_service = self._makeRPCService(config["rpc"])
-        rpc_service.setServiceParent(services)
-
-        node_monitor = self._makeNodePowerMonitorService()
-        node_monitor.setServiceParent(services)
-
-        image_download_service = self._makeImageDownloadService(rpc_service)
-        image_download_service.setServiceParent(services)
-
-        dhcp_probe_service = self._makeDHCPProbeService(rpc_service)
-        dhcp_probe_service.setServiceParent(services)
-
-        lease_upload_service = self._makeLeaseUploadService(rpc_service)
-        lease_upload_service.setServiceParent(services)
-
-        service_monitor_service = self._makeServiceMonitorService()
-        service_monitor_service.setServiceParent(services)
+        with ClusterConfiguration.open() as config:
+            for service in self._makeServices(config):
+                service.setServiceParent(services)
 
         if options["introspect"] is not None:
             introspect = self._makeIntrospectionService(options["introspect"])

=== modified file 'src/provisioningserver/pserv_services/image_download_service.py'
--- src/provisioningserver/pserv_services/image_download_service.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/pserv_services/image_download_service.py	2015-07-03 11:18:28 +0000
@@ -45,22 +45,24 @@
 
 
 class ImageDownloadService(TimerService, object):
-    """Twisted service to periodically refresh ephemeral images.
-
-    :param client_service: A `ClusterClientService` instance for talking
-        to the region controller.
-    :param reactor: An `IReactor` instance.
-    """
+    """Twisted service to periodically refresh ephemeral images."""
 
     check_interval = timedelta(minutes=5).total_seconds()
 
-    def __init__(self, client_service, reactor, cluster_uuid):
-        # Call self.check() every self.check_interval.
+    def __init__(self, client_service, cluster_uuid, tftp_root, reactor):
+        """Twisted service to periodically refresh ephemeral images.
+
+        :param client_service: A `ClusterClientService` instance.
+        :param cluster_uuid: The UUID for this cluster, as a string.
+        :param tftp_root: The path to the TFTP root directory.
+        :param reactor: An `IReactor` instance.
+        """
         super(ImageDownloadService, self).__init__(
             self.check_interval, self.try_download)
-        self.clock = reactor
         self.client_service = client_service
         self.uuid = cluster_uuid
+        self.tftp_root = tftp_root
+        self.clock = reactor
 
     def try_download(self):
         """Wrap download attempts in something that catches Failures.
@@ -125,11 +127,10 @@
         """Check the time the last image refresh happened and initiate a new
         one if older than 15 minutes.
         """
-        last_modified = tftppath.maas_meta_last_modified()
+        last_modified = tftppath.maas_meta_last_modified(self.tftp_root)
         if last_modified is None:
             yield self._start_download()
-            return
-
-        age_in_seconds = self.clock.seconds() - last_modified
-        if age_in_seconds >= timedelta(minutes=15).total_seconds():
-            yield self._start_download()
+        else:
+            age_in_seconds = self.clock.seconds() - last_modified
+            if age_in_seconds >= timedelta(minutes=15).total_seconds():
+                yield self._start_download()

=== modified file 'src/provisioningserver/pserv_services/service_monitor_service.py'
--- src/provisioningserver/pserv_services/service_monitor_service.py	2015-05-19 19:02:22 +0000
+++ src/provisioningserver/pserv_services/service_monitor_service.py	2015-07-03 11:18:28 +0000
@@ -20,6 +20,7 @@
 
 from datetime import timedelta
 
+from provisioningserver.config import is_dev_environment
 from provisioningserver.service_monitor import service_monitor
 from twisted.application.internet import TimerService
 from twisted.internet.threads import deferToThread
@@ -41,6 +42,11 @@
         """Monitors all of the external services and makes sure they
         stay running.
         """
-        d = deferToThread(service_monitor.ensure_all_services)
-        d.addErrback(log.err, "Failed to monitor services.")
-        return d
+        if is_dev_environment():
+            log.msg(
+                "Skipping check of services; they're not running under "
+                "the supervision of Upstart or systemd.")
+        else:
+            d = deferToThread(service_monitor.ensure_all_services)
+            d.addErrback(log.err, "Failed to monitor services.")
+            return d

=== modified file 'src/provisioningserver/pserv_services/tests/test_image_download_service.py'
--- src/provisioningserver/pserv_services/tests/test_image_download_service.py	2015-05-22 15:52:13 +0000
+++ src/provisioningserver/pserv_services/tests/test_image_download_service.py	2015-07-03 11:18:28 +0000
@@ -57,11 +57,13 @@
 
     def test_init(self):
         service = ImageDownloadService(
-            sentinel.service, sentinel.clock, sentinel.uuid)
+            sentinel.service, sentinel.uuid, sentinel.tftp_root,
+            sentinel.clock)
         self.assertIsInstance(service, TimerService)
         self.assertIs(service.clock, sentinel.clock)
         self.assertIs(service.uuid, sentinel.uuid)
         self.assertIs(service.client_service, sentinel.service)
+        self.assertIs(service.tftp_root, sentinel.tftp_root)
 
     def patch_download(self, service, return_value):
         patched = self.patch(service, '_start_download')
@@ -71,7 +73,7 @@
     def test_is_called_every_interval(self):
         clock = Clock()
         service = ImageDownloadService(
-            sentinel.service, clock, sentinel.uuid)
+            sentinel.service, sentinel.uuid, sentinel.tftp_root, clock)
         # Avoid actual downloads:
         self.patch_download(service, None)
         maas_meta_last_modified = self.patch(
@@ -100,7 +102,7 @@
     def test_initiates_download_if_no_meta_file(self):
         clock = Clock()
         service = ImageDownloadService(
-            sentinel.service, clock, sentinel.uuid)
+            sentinel.service, sentinel.uuid, sentinel.tftp_root, clock)
         _start_download = self.patch_download(service, None)
         self.patch(
             tftppath,
@@ -111,7 +113,7 @@
     def test_initiates_download_if_15_minutes_has_passed(self):
         clock = Clock()
         service = ImageDownloadService(
-            sentinel.service, clock, sentinel.uuid)
+            sentinel.service, sentinel.uuid, sentinel.tftp_root, clock)
         _start_download = self.patch_download(service, None)
         one_week_ago = clock.seconds() - timedelta(minutes=15).total_seconds()
         self.patch(
@@ -123,7 +125,7 @@
     def test_no_download_if_15_minutes_has_not_passed(self):
         clock = Clock()
         service = ImageDownloadService(
-            sentinel.service, clock, sentinel.uuid)
+            sentinel.service, sentinel.uuid, sentinel.tftp_root, clock)
         _start_download = self.patch_download(service, None)
         one_week = timedelta(minutes=15).total_seconds()
         self.patch(
@@ -159,7 +161,7 @@
         deferToThread = self.patch(boot_images, 'deferToThread')
         deferToThread.return_value = defer.succeed(None)
         service = ImageDownloadService(
-            rpc_client, clock, sentinel.uuid)
+            rpc_client, sentinel.uuid, sentinel.tftp_root, clock)
         service.startService()
         self.assertThat(
             deferToThread, MockCalledOnceWith(
@@ -173,13 +175,13 @@
 
         deferToThread = self.patch(boot_images, 'deferToThread')
         service = ImageDownloadService(
-            rpc_client, Clock(), sentinel.uuid)
+            rpc_client, sentinel.uuid, self.make_dir(), Clock())
         service.startService()
         self.assertThat(deferToThread, MockNotCalled())
 
     def test_logs_other_errors(self):
         service = ImageDownloadService(
-            sentinel.rpc, Clock(), sentinel.uuid)
+            sentinel.rpc, sentinel.uuid, sentinel.tftp_root, Clock())
 
         maybe_start_download = self.patch(service, "maybe_start_download")
         maybe_start_download.return_value = defer.fail(
@@ -215,7 +217,7 @@
             ]
 
         service = ImageDownloadService(
-            sentinel.rpc, clock, sentinel.uuid)
+            sentinel.rpc, sentinel.uuid, sentinel.tftp_root, clock)
         sources = yield service._get_boot_sources(client_call)
         self.assertEqual(sources.get('sources'), sentinel.sources)
         self.assertThat(
@@ -232,7 +234,7 @@
             ]
 
         service = ImageDownloadService(
-            sentinel.rpc, clock, sentinel.uuid)
+            sentinel.rpc, sentinel.uuid, sentinel.tftp_root, clock)
         yield service._get_boot_sources(client_call)
         self.assertThat(
             client_call,
@@ -270,7 +272,7 @@
             ]
 
         service = ImageDownloadService(
-            sentinel.rpc, clock, sentinel.uuid)
+            sentinel.rpc, sentinel.uuid, sentinel.tftp_root, clock)
         sources = yield service._get_boot_sources(client_call)
         os_selections = [
             selection.get('os')

=== modified file 'src/provisioningserver/pserv_services/tests/test_service_monitor_service.py'
--- src/provisioningserver/pserv_services/tests/test_service_monitor_service.py	2015-06-10 11:35:04 +0000
+++ src/provisioningserver/pserv_services/tests/test_service_monitor_service.py	2015-07-03 11:18:28 +0000
@@ -15,11 +15,15 @@
 __metaclass__ = type
 __all__ = []
 
-from maastesting.matchers import MockCalledOnceWith
+from maastesting.matchers import (
+    MockCalledOnceWith,
+    MockNotCalled,
+)
 from maastesting.testcase import (
     MAASTestCase,
     MAASTwistedRunTest,
 )
+from maastesting.twisted import TwistedLoggerFixture
 from provisioningserver.pserv_services import service_monitor_service as sms
 from provisioningserver.service_monitor import service_monitor
 from testtools.matchers import MatchesStructure
@@ -40,7 +44,23 @@
         service = sms.ServiceMonitorService(Clock())
         return service
 
+    def test_monitor_services_does_not_do_anything_in_dev_environment(self):
+        # Belt-n-braces make sure we're in a development environment.
+        self.assertTrue(sms.is_dev_environment())
+
+        service = self.make_monitor_service()
+        mock_deferToThread = self.patch(sms, "deferToThread")
+        with TwistedLoggerFixture() as logger:
+            service.monitor_services()
+        self.assertThat(mock_deferToThread, MockNotCalled())
+        self.assertDocTestMatches(
+            "Skipping check of services; they're not running under the "
+            "supervision of Upstart or systemd.", logger.output)
+
     def test_monitor_services_defers_ensure_all_services_to_thread(self):
+        # Pretend we're in a production environment.
+        self.patch(sms, "is_dev_environment").return_value = False
+
         service = self.make_monitor_service()
         mock_deferToThread = self.patch(sms, "deferToThread")
         service.monitor_services()

=== modified file 'src/provisioningserver/pserv_services/tests/test_tftp.py'
--- src/provisioningserver/pserv_services/tests/test_tftp.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/pserv_services/tests/test_tftp.py	2015-07-03 11:18:28 +0000
@@ -30,7 +30,6 @@
     urlparse,
 )
 
-from fixtures import EnvironmentVariable
 from maastesting.factory import factory
 from maastesting.matchers import (
     MockCalledOnceWith,
@@ -54,6 +53,7 @@
 from provisioningserver.boot import BytesReader
 from provisioningserver.boot.pxe import PXEBootMethod
 from provisioningserver.boot.tests.test_pxe import compose_config_path
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.events import EVENT_TYPES
 from provisioningserver.pserv_services import tftp as tftp_module
 from provisioningserver.pserv_services.tftp import (
@@ -63,6 +63,7 @@
     TFTPService,
     UDPServer,
 )
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.tests.test_kernel_opts import make_kernel_parameters
 from testtools import ExpectedException
 from testtools.matchers import (
@@ -70,6 +71,7 @@
     AllMatch,
     Equals,
     HasLength,
+    Is,
     IsInstance,
     MatchesAll,
     MatchesStructure,
@@ -127,6 +129,7 @@
 
     def setUp(self):
         super(TestTFTPBackend, self).setUp()
+        self.useFixture(ClusterConfigurationFixture())
         from provisioningserver import boot
         self.patch(boot, "find_mac_via_arp")
         self.patch(tftp_module, 'log_request')
@@ -135,10 +138,11 @@
         temp_dir = self.make_dir()
         generator_url = "http://%s.example.com/%s" % (
             factory.make_name("domain"), factory.make_name("path"))
-        backend = TFTPBackend(temp_dir, generator_url)
+        backend = TFTPBackend(temp_dir, generator_url, sentinel.uuid)
         self.assertEqual((True, False), (backend.can_read, backend.can_write))
         self.assertEqual(temp_dir, backend.base.path)
         self.assertEqual(generator_url, backend.generator_url.geturl())
+        self.assertIs(backend.cluster_uuid, sentinel.uuid)
 
     def test_get_generator_url(self):
         # get_generator_url() merges the parameters obtained from the request
@@ -146,7 +150,7 @@
         mac = factory.make_mac_address("-")
         dummy = factory.make_name("dummy").encode("ascii")
         backend_url = b"http://example.com/?" + urlencode({b"dummy": dummy})
-        backend = TFTPBackend(self.make_dir(), backend_url)
+        backend = TFTPBackend(self.make_dir(), backend_url, sentinel.uuid)
         # params is an example of the parameters obtained from a request.
         params = {"mac": mac}
         generator_url = urlparse(backend.get_generator_url(params))
@@ -161,7 +165,8 @@
     def get_reader(self, data):
         temp_file = self.make_file(name="example", contents=data)
         temp_dir = os.path.dirname(temp_file)
-        backend = TFTPBackend(temp_dir, "http://nowhere.example.com/")
+        backend = TFTPBackend(
+            temp_dir, "http://nowhere.example.com/", sentinel.uuid)
         return backend.get_reader("example")
 
     @inlineCallbacks
@@ -188,7 +193,8 @@
         factory.make_file(os.path.join(temp_dir, subdir), filename, data)
 
         path = '\\%s\\%s' % (subdir, filename)
-        backend = TFTPBackend(temp_dir, "http://nowhere.example.com/")
+        backend = TFTPBackend(
+            temp_dir, "http://nowhere.example.com/", sentinel.uuid)
         reader = yield backend.get_reader(path)
 
         self.addCleanup(reader.finish)
@@ -219,9 +225,11 @@
 
     @inlineCallbacks
     def test_get_reader_converts_404s_to_tftp_error(self):
-        self.useFixture(EnvironmentVariable("CLUSTER_UUID", "foobar"))
+        with ClusterConfiguration.open() as config:
+            config.cluster_uuid = factory.make_UUID()
 
-        backend = TFTPBackend(self.make_dir(), "http://example.com/")
+        backend = TFTPBackend(
+            self.make_dir(), "http://example.com/", sentinel.uuid)
         get_page = self.patch(backend, 'get_page')
         get_page.side_effect = twisted.web.error.Error(httplib.NOT_FOUND)
 
@@ -230,11 +238,13 @@
 
     @inlineCallbacks
     def test_get_reader_converts_other_exceptions_to_tftp_error(self):
-        self.useFixture(EnvironmentVariable("CLUSTER_UUID", "foobar"))
+        with ClusterConfiguration.open() as config:
+            config.cluster_uuid = factory.make_UUID()
 
         exception_type = factory.make_exception_type()
         exception_message = factory.make_string()
-        backend = TFTPBackend(self.make_dir(), "http://example.com/")
+        backend = TFTPBackend(
+            self.make_dir(), "http://example.com/", sentinel.uuid)
         get_page = self.patch(backend, 'get_page')
         get_page.side_effect = exception_type(exception_message)
 
@@ -257,11 +267,12 @@
         # For paths matching PXEBootMethod.match_path, TFTPBackend.get_reader()
         # returns a Deferred that will yield a BytesReader.
         cluster_uuid = factory.make_UUID()
-        get_cluster_uuid = self.patch(tftp_module, 'get_cluster_uuid')
-        get_cluster_uuid.return_value = cluster_uuid
+        with ClusterConfiguration.open() as config:
+            config.cluster_uuid = cluster_uuid
         mac = factory.make_mac_address("-")
         config_path = compose_config_path(mac)
-        backend = TFTPBackend(self.make_dir(), b"http://example.com/")
+        backend = TFTPBackend(
+            self.make_dir(), b"http://example.com/", cluster_uuid)
         # python-tx-tftp sets up call context so that backends can discover
         # more about the environment in which they're running.
         call_context = {"local": local, "remote": remote}
@@ -318,7 +329,8 @@
         # get_boot_method_reader() takes a dict() of parameters and returns an
         # `IReader` of a PXE configuration, rendered by
         # `PXEBootMethod.get_reader`.
-        backend = TFTPBackend(self.make_dir(), b"http://example.com/")
+        backend = TFTPBackend(
+            self.make_dir(), b"http://example.com/", sentinel.uuid)
         # Fake configuration parameters, as discovered from the file path.
         fake_params = {"mac": factory.make_mac_address("-")}
         # Fake kernel configuration parameters, as returned from the API call.
@@ -356,10 +368,11 @@
         # arch field of the parameters (mapping from pxe to maas
         # namespace).
         cluster_uuid = factory.make_UUID()
-        get_cluster_uuid = self.patch(tftp_module, 'get_cluster_uuid')
-        get_cluster_uuid.return_value = cluster_uuid
+        with ClusterConfiguration.open() as config:
+            config.cluster_uuid = cluster_uuid
         config_path = "pxelinux.cfg/default-arm"
-        backend = TFTPBackend(self.make_dir(), b"http://example.com/")
+        backend = TFTPBackend(
+            self.make_dir(), b"http://example.com/", cluster_uuid)
         # python-tx-tftp sets up call context so that backends can discover
         # more about the environment in which they're running.
         call_context = {
@@ -400,7 +413,7 @@
         example_port = factory.pick_port()
         tftp_service = TFTPService(
             resource_root=example_root, generator=example_generator,
-            port=example_port)
+            port=example_port, uuid=sentinel.uuid)
         tftp_service.updateServers()
         # The "tftp" service is a multi-service containing UDP servers for
         # each interface defined by get_all_interface_addresses().
@@ -418,7 +431,10 @@
                 Equals(example_root)),
             AfterPreprocessing(
                 lambda backend: backend.generator_url.geturl(),
-                Equals(example_generator)))
+                Equals(example_generator)),
+            AfterPreprocessing(
+                lambda backend: backend.cluster_uuid,
+                Is(sentinel.uuid)))
         expected_protocol = MatchesAll(
             IsInstance(TFTP),
             AfterPreprocessing(
@@ -452,7 +468,7 @@
 
         tftp_service = TFTPService(
             resource_root=self.make_dir(), generator="http://mighty/wind",
-            port=factory.pick_port())
+            port=factory.pick_port(), uuid=sentinel.uuid)
         tftp_service.updateServers()
 
         # The child services of tftp_services are named after the
@@ -494,7 +510,7 @@
 
         tftp_service = TFTPService(
             resource_root=self.make_dir(), generator="http://mighty/wind",
-            port=factory.pick_port())
+            port=factory.pick_port(), uuid=sentinel.uuid)
         tftp_service.updateServers()
 
         # Only the "normal" addresses have been used.

=== modified file 'src/provisioningserver/pserv_services/tftp.py'
--- src/provisioningserver/pserv_services/tftp.py	2015-05-01 13:30:13 +0000
+++ src/provisioningserver/pserv_services/tftp.py	2015-07-03 11:18:28 +0000
@@ -35,7 +35,6 @@
     BootMethodRegistry,
     get_remote_mac,
 )
-from provisioningserver.cluster_config import get_cluster_uuid
 from provisioningserver.drivers import ArchitectureRegistry
 from provisioningserver.events import (
     EVENT_TYPES,
@@ -109,16 +108,18 @@
     fetch files at many similar paths which must not be passed on.
     """
 
-    def __init__(self, base_path, generator_url):
+    def __init__(self, base_path, generator_url, cluster_uuid):
         """
         :param base_path: The root directory for this TFTP server.
         :param generator_url: The URL which can be queried for the PXE
             config. See `get_generator_url` for the types of queries it is
             expected to accept.
+        :param cluster_uuid: The cluster's UUID, as a string.
         """
         super(TFTPBackend, self).__init__(
             base_path, can_read=True, can_write=False)
         self.generator_url = urlparse(generator_url)
+        self.cluster_uuid = cluster_uuid
         self.fetcher = PageFetcher(agent=self.__class__)
         self.get_page = self.fetcher.get
 
@@ -223,7 +224,7 @@
         params["local"] = local_host
         remote_host, remote_port = tftp.get_remote_address()
         params["remote"] = remote_host
-        params["cluster_uuid"] = get_cluster_uuid()
+        params["cluster_uuid"] = self.cluster_uuid
         d = self.get_boot_method_reader(boot_method, params)
         return d
 
@@ -314,16 +315,17 @@
 
     """
 
-    def __init__(self, resource_root, port, generator):
+    def __init__(self, resource_root, port, generator, uuid):
         """
         :param resource_root: The root directory for this TFTP server.
         :param port: The port on which each server should be started.
         :param generator: The URL to be queried for PXE configuration.
             This will normally point to the `pxeconfig` endpoint on the
             region-controller API.
+        :param uuid: The cluster's UUID, as a string.
         """
         super(TFTPService, self).__init__()
-        self.backend = TFTPBackend(resource_root, generator)
+        self.backend = TFTPBackend(resource_root, generator, uuid)
         self.port = port
         # Establish a periodic call to self.updateServers() every 45
         # seconds, so that this service eventually converges on truth.

=== modified file 'src/provisioningserver/rpc/boot_images.py'
--- src/provisioningserver/rpc/boot_images.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/rpc/boot_images.py	2015-07-03 11:18:28 +0000
@@ -18,13 +18,12 @@
     "is_import_boot_images_running",
     ]
 
-import os
 from urlparse import urlparse
 
 from provisioningserver import concurrency
 from provisioningserver.auth import get_maas_user_gpghome
 from provisioningserver.boot import tftppath
-from provisioningserver.config import BOOT_RESOURCES_STORAGE
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.import_images import boot_resources
 from provisioningserver.utils.env import environment_variables
 from provisioningserver.utils.twisted import synchronous
@@ -41,10 +40,11 @@
     of IO, as this function is called often. To update the cache call
     `reload_boot_images`.
     """
+
     global CACHED_BOOT_IMAGES
     if CACHED_BOOT_IMAGES is None:
-        CACHED_BOOT_IMAGES = tftppath.list_boot_images(
-            os.path.join(BOOT_RESOURCES_STORAGE, 'current'))
+        with ClusterConfiguration.open() as config:
+            CACHED_BOOT_IMAGES = tftppath.list_boot_images(config.tftp_root)
     return CACHED_BOOT_IMAGES
 
 
@@ -52,8 +52,8 @@
     """Update the cached boot images so `list_boot_images` returns the
     most up-to-date boot images list."""
     global CACHED_BOOT_IMAGES
-    CACHED_BOOT_IMAGES = tftppath.list_boot_images(
-        os.path.join(BOOT_RESOURCES_STORAGE, 'current'))
+    with ClusterConfiguration.open() as config:
+        CACHED_BOOT_IMAGES = tftppath.list_boot_images(config.tftp_root)
 
 
 def get_hosts_from_sources(sources):

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
--- src/provisioningserver/rpc/clusterservice.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/rpc/clusterservice.py	2015-07-03 11:18:28 +0000
@@ -26,10 +26,7 @@
 from apiclient.creds import convert_string_to_tuple
 from apiclient.utils import ascii_url
 from provisioningserver import concurrency
-from provisioningserver.cluster_config import (
-    get_cluster_uuid,
-    get_maas_url,
-)
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.drivers import (
     ArchitectureRegistry,
     PowerTypeRegistry,
@@ -135,7 +132,8 @@
         Implementation of
         :py:class:`~provisioningserver.rpc.cluster.Identify`.
         """
-        return {b"ident": get_cluster_uuid().decode("ascii")}
+        with ClusterConfiguration.open() as config:
+            return {b"ident": config.cluster_uuid}
 
     @cluster.Authenticate.responder
     def authenticate(self, message):
@@ -508,9 +506,11 @@
         returnValue(digest == digest_local)
 
     def registerWithRegion(self):
-        uuid = get_cluster_uuid()
+        with ClusterConfiguration.open() as config:
+            uuid = config.cluster_uuid
+            url = config.maas_url
+
         networks = discover_networks()
-        url = get_maas_url()
 
         def cb_register(_):
             log.msg(
@@ -760,9 +760,10 @@
     @staticmethod
     def _get_rpc_info_url():
         """Return the URL to the RPC infomation page on the region."""
-        url = urlparse(get_maas_url())
-        url = url._replace(path="%s/rpc/" % url.path.rstrip("/"))
-        url = url.geturl()
+        with ClusterConfiguration.open() as config:
+            url = urlparse(config.maas_url)
+            url = url._replace(path="%s/rpc/" % url.path.rstrip("/"))
+            url = url.geturl()
         return ascii_url(url)
 
     @classmethod

=== modified file 'src/provisioningserver/rpc/tags.py'
--- src/provisioningserver/rpc/tags.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/rpc/tags.py	2015-07-03 11:18:28 +0000
@@ -21,10 +21,7 @@
     MAASDispatcher,
     MAASOAuth,
 )
-from provisioningserver.cluster_config import (
-    get_cluster_uuid,
-    get_maas_url,
-)
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.tags import process_node_tags
 from provisioningserver.utils.twisted import synchronous
 
@@ -38,9 +35,12 @@
     :param tag_nsmap: The namespace map as used by LXML's ETree library.
     :param credentials: A 3-tuple of OAuth credentials.
     """
+    with ClusterConfiguration.open() as config:
+        cluster_uuid = config.cluster_uuid
+        maas_url = config.maas_url
     client = MAASClient(
         auth=MAASOAuth(*credentials), dispatcher=MAASDispatcher(),
-        base_url=get_maas_url())
+        base_url=maas_url)
     process_node_tags(
         tag_name=tag_name, tag_definition=tag_definition, tag_nsmap=tag_nsmap,
-        client=client, nodegroup_uuid=get_cluster_uuid())
+        client=client, nodegroup_uuid=cluster_uuid)

=== modified file 'src/provisioningserver/rpc/testing/__init__.py'
--- src/provisioningserver/rpc/testing/__init__.py	2015-05-22 15:36:53 +0000
+++ src/provisioningserver/rpc/testing/__init__.py	2015-07-03 11:18:28 +0000
@@ -29,7 +29,6 @@
 from os import path
 
 import fixtures
-from fixtures import EnvironmentVariable
 from maastesting.factory import factory
 from maastesting.fixtures import TempDirectory
 from maastesting.twisted import always_succeed_with
@@ -176,11 +175,6 @@
     @asynchronous(timeout=15)
     def setUp(self):
         super(MockClusterToRegionRPCFixtureBase, self).setUp()
-        # Ensure that we have MAAS_URL and CLUSTER_UUID set.
-        self.useFixture(EnvironmentVariable(
-            "MAAS_URL", factory.make_simple_http_url()))
-        self.useFixture(EnvironmentVariable(
-            "CLUSTER_UUID", factory.make_UUID().encode("ascii")))
         # Use an inert clock with ClusterClientService so it doesn't update
         # itself except when we ask it to.
         self.rpc_service = ClusterClientService(Clock())

=== modified file 'src/provisioningserver/rpc/tests/test_boot_images.py'
--- src/provisioningserver/rpc/tests/test_boot_images.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/rpc/tests/test_boot_images.py	2015-07-03 11:18:28 +0000
@@ -29,7 +29,6 @@
 )
 from provisioningserver import concurrency
 from provisioningserver.boot import tftppath
-from provisioningserver.config import BOOT_RESOURCES_STORAGE
 from provisioningserver.import_images import boot_resources
 from provisioningserver.rpc import boot_images
 from provisioningserver.rpc.boot_images import (
@@ -40,7 +39,10 @@
     list_boot_images,
     reload_boot_images,
 )
-from provisioningserver.testing.config import BootSourcesFixture
+from provisioningserver.testing.config import (
+    BootSourcesFixture,
+    ClusterConfigurationFixture,
+)
 from provisioningserver.testing.testcase import PservTestCase
 from provisioningserver.utils.twisted import pause
 from testtools.matchers import Equals
@@ -64,14 +66,18 @@
 
 class TestListBootImages(PservTestCase):
 
+    def setUp(self):
+        super(TestListBootImages, self).setUp()
+        self.tftp_root = self.make_dir()
+        self.useFixture(ClusterConfigurationFixture(tftp_root=self.tftp_root))
+
     def test__calls_list_boot_images_with_boot_resource_storage(self):
         self.patch(boot_images, 'CACHED_BOOT_IMAGES', None)
         mock_list_boot_images = self.patch(tftppath, 'list_boot_images')
         list_boot_images()
         self.assertThat(
             mock_list_boot_images,
-            MockCalledOnceWith(
-                os.path.join(BOOT_RESOURCES_STORAGE, "current")))
+            MockCalledOnceWith(self.tftp_root))
 
     def test__calls_list_boot_images_when_cache_is_None(self):
         self.patch(boot_images, 'CACHED_BOOT_IMAGES', None)

=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
--- src/provisioningserver/rpc/tests/test_clusterservice.py	2015-06-16 21:10:26 +0000
+++ src/provisioningserver/rpc/tests/test_clusterservice.py	2015-07-03 11:18:28 +0000
@@ -29,7 +29,6 @@
 from urlparse import urlparse
 
 from apiclient.creds import convert_tuple_to_string
-from fixtures import EnvironmentVariable
 from maastesting.factory import factory
 from maastesting.matchers import (
     IsUnfiredDeferred,
@@ -57,10 +56,6 @@
 from provisioningserver import concurrency
 from provisioningserver.boot import tftppath
 from provisioningserver.boot.tests.test_tftppath import make_osystem
-from provisioningserver.cluster_config import (
-    get_cluster_uuid,
-    get_maas_url,
-)
 from provisioningserver.dhcp.testing.config import make_subnet_config
 from provisioningserver.drivers.osystem import (
     OperatingSystem,
@@ -108,6 +103,7 @@
     StubOS,
 )
 from provisioningserver.security import set_shared_secret_on_filesystem
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from testtools import ExpectedException
 from testtools.deferredruntest import extract_result
 from testtools.matchers import (
@@ -154,9 +150,8 @@
 
     def test_identify_reports_cluster_uuid(self):
         example_uuid = factory.make_UUID()
-
-        get_cluster_uuid = self.patch(clusterservice, "get_cluster_uuid")
-        get_cluster_uuid.return_value = example_uuid
+        self.useFixture(ClusterConfigurationFixture(
+            cluster_uuid=example_uuid))
 
         d = call_responder(Cluster(), cluster.Identify, {})
 
@@ -232,6 +227,7 @@
 
     @inlineCallbacks
     def test_list_boot_images_can_be_called(self):
+        self.useFixture(ClusterConfigurationFixture())
         self.patch(boot_images, 'CACHED_BOOT_IMAGES', None)
         list_boot_images = self.patch(tftppath, "list_boot_images")
         list_boot_images.return_value = []
@@ -254,14 +250,16 @@
         labels = "beta-1", "release"
         purposes = "commissioning", "install", "xinstall"
 
-        # Create a TFTP file tree with a variety of subdirectories.
+        # Populate a TFTP file tree with a variety of subdirectories.
         tftpdir = self.make_dir()
         current_dir = os.path.join(tftpdir, 'current')
         os.makedirs(current_dir)
         for options in product(osystems, archs, subarchs, releases, labels):
             os.makedirs(os.path.join(current_dir, *options))
             make_osystem(self, options[0], purposes)
-        self.patch(boot_images, 'BOOT_RESOURCES_STORAGE', tftpdir)
+
+        self.useFixture(ClusterConfigurationFixture(
+            tftp_root=os.path.join(tftpdir, "current")))
         self.patch(boot_images, 'CACHED_BOOT_IMAGES', None)
 
         expected_images = [
@@ -470,7 +468,7 @@
     def test__get_rpc_info_url(self):
         maas_url = "http://%s/%s/" % (
             factory.make_hostname(), factory.make_name("path"))
-        self.useFixture(EnvironmentVariable("MAAS_URL", maas_url))
+        self.useFixture(ClusterConfigurationFixture(maas_url=maas_url))
         expected_rpc_info_url = maas_url + "rpc/"
         observed_rpc_info_url = ClusterClientService._get_rpc_info_url()
         self.assertThat(observed_rpc_info_url, Equals(expected_rpc_info_url))
@@ -550,7 +548,7 @@
     def test_update_calls__update_connections(self):
         maas_url = "http://%s/%s/" % (
             factory.make_hostname(), factory.make_name("path"))
-        self.useFixture(EnvironmentVariable("MAAS_URL", maas_url))
+        self.useFixture(ClusterConfigurationFixture(maas_url=maas_url))
         getPage = self.patch(clusterservice, "getPage")
         getPage.return_value = succeed(self.example_rpc_info_view_response)
         service = ClusterClientService(Clock())
@@ -817,10 +815,9 @@
 
     def setUp(self):
         super(TestClusterClient, self).setUp()
-        self.useFixture(EnvironmentVariable(
-            "MAAS_URL", factory.make_simple_http_url()))
-        self.useFixture(EnvironmentVariable(
-            "CLUSTER_UUID", factory.make_UUID().encode("ascii")))
+        self.useFixture(ClusterConfigurationFixture(
+            maas_url=factory.make_simple_http_url(),
+            cluster_uuid=factory.make_UUID()))
 
     def make_running_client(self):
         client = clusterservice.ClusterClient(
@@ -1220,15 +1217,18 @@
 
     @inlineCallbacks
     def test_registerWithRegion_end_to_end(self):
+        maas_url = factory.make_simple_http_url()
+        cluster_uuid = factory.make_UUID()
+        self.useFixture(ClusterConfigurationFixture(
+            maas_url=maas_url, cluster_uuid=cluster_uuid))
         fixture = self.useFixture(MockLiveClusterToRegionRPCFixture())
         protocol, connecting = fixture.makeEventLoop()
         self.addCleanup((yield connecting))
         yield getRegionClient()
         self.assertThat(
             protocol.Register, MockCalledOnceWith(
-                protocol, uuid=get_cluster_uuid(),
-                networks=discover_networks(),
-                url=urlparse(get_maas_url())))
+                protocol, uuid=cluster_uuid, networks=discover_networks(),
+                url=urlparse(maas_url)))
 
 
 class TestClusterProtocol_ListSupportedArchitectures(MAASTestCase):
@@ -1859,11 +1859,7 @@
 
     @inlineCallbacks
     def test_happy_path(self):
-        get_maas_url = self.patch_autospec(tags, "get_maas_url")
-        get_maas_url.return_value = sentinel.maas_url
-        get_cluster_uuid = self.patch_autospec(tags, "get_cluster_uuid")
-        get_cluster_uuid.return_value = sentinel.cluster_uuid
-
+        self.useFixture(ClusterConfigurationFixture())
         # Prevent real work being done, which would involve HTTP calls.
         self.patch_autospec(tags, "process_node_tags")
 

=== modified file 'src/provisioningserver/rpc/tests/test_tags.py'
--- src/provisioningserver/rpc/tests/test_tags.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/rpc/tests/test_tags.py	2015-07-03 11:18:28 +0000
@@ -27,16 +27,17 @@
     sentinel,
 )
 from provisioningserver.rpc import tags
+from provisioningserver.testing.config import ClusterConfigurationFixture
 
 
 class TestEvaluateTag(MAASTestCase):
 
     def setUp(self):
         super(TestEvaluateTag, self).setUp()
-        get_maas_url = self.patch_autospec(tags, "get_maas_url")
-        get_maas_url.return_value = sentinel.maas_url
-        get_cluster_uuid = self.patch_autospec(tags, "get_cluster_uuid")
-        get_cluster_uuid.return_value = sentinel.cluster_uuid
+        self.mock_cluster_uuid = factory.make_UUID()
+        self.mock_url = factory.make_simple_http_url()
+        self.useFixture(ClusterConfigurationFixture(
+            cluster_uuid=self.mock_cluster_uuid, maas_url=self.mock_url))
 
     def test__calls_process_node_tags(self):
         credentials = "aaa", "bbb", "ccc"
@@ -49,7 +50,7 @@
                 tag_name=sentinel.tag_name,
                 tag_definition=sentinel.tag_definition,
                 tag_nsmap=sentinel.tag_nsmap, client=ANY,
-                nodegroup_uuid=sentinel.cluster_uuid))
+                nodegroup_uuid=self.mock_cluster_uuid))
 
     def test__constructs_client_with_credentials(self):
         consumer_key = factory.make_name("ckey")
@@ -66,7 +67,7 @@
 
         client = tags.process_node_tags.call_args[1]["client"]
         self.assertIsInstance(client, MAASClient)
-        self.assertEqual(sentinel.maas_url, client.url)
+        self.assertEqual(self.mock_url, client.url)
         self.assertIsInstance(client.dispatcher, MAASDispatcher)
         self.assertIsInstance(client.auth, MAASOAuth)
         self.assertThat(tags.MAASOAuth, MockCalledOnceWith(

=== modified file 'src/provisioningserver/testing/config.py'
--- src/provisioningserver/testing/config.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/testing/config.py	2015-07-03 11:18:28 +0000
@@ -15,10 +15,8 @@
 __all__ = [
     "BootSourcesFixture",
     "ClusterConfigurationFixture",
-    "ConfigFixture",
     "ConfigFixtureBase",
     "ConfigurationFixtureBase",
-    "set_tftp_root",
     ]
 
 from os import path
@@ -31,7 +29,6 @@
 from provisioningserver.config import (
     BootSources,
     ClusterConfiguration,
-    Config,
 )
 import yaml
 
@@ -69,15 +66,6 @@
             self.useFixture(EnvironmentVariableFixture(name, value))
 
 
-class ConfigFixture(ConfigFixtureBase):
-    """Fixture to substitute for :class:`Config` in tests."""
-
-    schema = Config
-
-    def __init__(self, config=None, name='pserv.yaml'):
-        super(ConfigFixture, self).__init__(config=config, name=name)
-
-
 class BootSourcesFixture(ConfigFixtureBase):
     """Fixture to substitute for :class:`BootSources` in tests.
 
@@ -93,14 +81,6 @@
         super(BootSourcesFixture, self).__init__(config=sources, name=name)
 
 
-def set_tftp_root(tftproot):
-    """Create a `ConfigFixture` fixture that sets the TFTP root directory.
-
-    Add the resulting fixture to your test using `self.useFixture`.
-    """
-    return ConfigFixture({'tftp': {'resource_root': tftproot}})
-
-
 class ConfigurationFixtureBase(Fixture):
     """Base class for new-style configuration testing fixtures.
 

=== modified file 'src/provisioningserver/testing/testcase.py'
--- src/provisioningserver/testing/testcase.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/testing/testcase.py	2015-07-03 11:18:28 +0000
@@ -16,22 +16,13 @@
     'PservTestCase',
     ]
 
-from fixtures import EnvironmentVariableFixture
 from maastesting import testcase
-from maastesting.factory import factory
 from twisted.internet import reactor
 from twisted.python import threadable
 
 
 class PservTestCase(testcase.MAASTestCase):
 
-    def make_maas_url(self):
-        return 'http://127.0.0.1/%s' % factory.make_name('path')
-
-    def set_maas_url(self):
-        self.useFixture(
-            EnvironmentVariableFixture("MAAS_URL", self.make_maas_url()))
-
     def register_as_io_thread(self):
         """Make the current thread the IO thread.
 

=== removed file 'src/provisioningserver/tests/test_cluster_config.py'
--- src/provisioningserver/tests/test_cluster_config.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/tests/test_cluster_config.py	1970-01-01 00:00:00 +0000
@@ -1,48 +0,0 @@
-# Copyright 2012-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for `provisioningserver.cluster_config`."""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
-__all__ = []
-
-from fixtures import EnvironmentVariableFixture
-from maastesting.factory import factory
-from maastesting.testcase import MAASTestCase
-from provisioningserver.cluster_config import (
-    get_cluster_uuid,
-    get_cluster_variable,
-    get_maas_url,
-)
-
-
-class TestClusterConfig(MAASTestCase):
-
-    def test_get_cluster_variable_reads_env(self):
-        var = factory.make_name('variable')
-        value = factory.make_name('value')
-        self.useFixture(EnvironmentVariableFixture(var, value))
-        self.assertEqual(value, get_cluster_variable(var))
-
-    def test_get_cluster_variable_fails_if_not_set(self):
-        self.assertRaises(
-            AssertionError,
-            get_cluster_variable, factory.make_name('nonexistent-variable'))
-
-    def test_get_cluster_uuid_reads_CLUSTER_UUID(self):
-        uuid = factory.make_name('uuid')
-        self.useFixture(EnvironmentVariableFixture('CLUSTER_UUID', uuid))
-        self.assertEqual(uuid, get_cluster_uuid())
-
-    def test_get_maas_url_reads_MAAS_URL(self):
-        maas_url = factory.make_name('maas_url')
-        self.useFixture(EnvironmentVariableFixture('MAAS_URL', maas_url))
-        self.assertEqual(maas_url, get_maas_url())

=== modified file 'src/provisioningserver/tests/test_cluster_config_command.py'
--- src/provisioningserver/tests/test_cluster_config_command.py	2015-04-09 16:21:27 +0000
+++ src/provisioningserver/tests/test_cluster_config_command.py	2015-07-03 11:18:28 +0000
@@ -1,7 +1,7 @@
 # Copyright 2015 Canonical Ltd.  This software is licensed under the
 # GNU Affero General Public License version 3 (see the file LICENSE).
 
-"""Tests for `MAAS_URL` configuration update code."""
+"""Tests for configuration update code."""
 
 from __future__ import (
     absolute_import,
@@ -28,12 +28,10 @@
     patch,
 )
 from provisioningserver import cluster_config_command
-from provisioningserver.cluster_config import (
-    CLUSTER_CONFIG,
-    get_config_cluster_variable,
-    set_config_cluster_variable,
+from provisioningserver.config import (
+    ClusterConfiguration,
+    UUID_NOT_SET,
 )
-from provisioningserver.config import UUID_NOT_SET
 from provisioningserver.testing.config import ClusterConfigurationFixture
 from testtools import ExpectedException
 
@@ -134,23 +132,28 @@
     def test_config_set_maas_url_sets_url(self):
         expected = factory.make_simple_http_url()
         cluster_config_command.run(self.make_args(region_url=expected))
-        observed = get_config_cluster_variable(CLUSTER_CONFIG.DB_maas_url)
+        with ClusterConfiguration.open() as config:
+            observed = config.maas_url
         self.assertEqual(expected, observed)
 
     def test_config_set_maas_url_without_setting_does_nothing(self):
-        expected = get_config_cluster_variable(CLUSTER_CONFIG.DB_maas_url)
+        with ClusterConfiguration.open() as config:
+            expected = config.maas_url
         cluster_config_command.run(self.make_args(region_url=None))
-        observed = get_config_cluster_variable(CLUSTER_CONFIG.DB_maas_url)
+        with ClusterConfiguration.open() as config:
+            observed = config.maas_url
         self.assertEqual(expected, observed)
 
     def test_config_set_cluster_uuid_sets_cluster_uuid(self):
         expected = unicode(uuid.uuid4())
         cluster_config_command.run(self.make_args(uuid=expected))
-        observed = get_config_cluster_variable(CLUSTER_CONFIG.DB_cluster_uuid)
+        with ClusterConfiguration.open() as config:
+            observed = config.cluster_uuid
         self.assertEqual(expected, observed)
 
     def get_parsed_uuid_from_config(self):
-        observed = get_config_cluster_variable(CLUSTER_CONFIG.DB_cluster_uuid)
+        with ClusterConfiguration.open() as config:
+            observed = config.cluster_uuid
         try:
             parsed_observed = unicode(uuid.UUID(observed))
         except:
@@ -160,10 +163,10 @@
 
     def test_config_set_cluster_uuid_without_setting_does_nothing(self):
         expected_previous_value = unicode(uuid.uuid4())
-        set_config_cluster_variable(
-            CLUSTER_CONFIG.DB_cluster_uuid, expected_previous_value)
-        observed_previous_value = get_config_cluster_variable(
-            CLUSTER_CONFIG.DB_cluster_uuid)
+        with ClusterConfiguration.open() as config:
+            config.cluster_uuid = expected_previous_value
+        with ClusterConfiguration.open() as config:
+            observed_previous_value = config.cluster_uuid
         self.assertEqual(expected_previous_value, observed_previous_value)
 
         cluster_config_command.run(self.make_args(uuid=None))
@@ -173,8 +176,8 @@
         self.assertEqual(parsed_observed, expected_previous_value)
 
     def test_config_init_creates_initial_cluster_id(self):
-        observed_default = get_config_cluster_variable(
-            CLUSTER_CONFIG.DB_cluster_uuid)
+        with ClusterConfiguration.open() as config:
+            observed_default = config.cluster_uuid
         self.assertEqual(UUID_NOT_SET, observed_default)
 
         cluster_config_command.run(self.make_args(init=True))
@@ -184,10 +187,10 @@
 
     def test_config_init_when_already_configured_does_nothing(self):
         expected_previous_value = unicode(uuid.uuid4())
-        set_config_cluster_variable(
-            CLUSTER_CONFIG.DB_cluster_uuid, expected_previous_value)
-        observed_previous_value = get_config_cluster_variable(
-            CLUSTER_CONFIG.DB_cluster_uuid)
+        with ClusterConfiguration.open() as config:
+            config.cluster_uuid = expected_previous_value
+        with ClusterConfiguration.open() as config:
+            observed_previous_value = config.cluster_uuid
         self.assertEqual(expected_previous_value, observed_previous_value)
 
         cluster_config_command.run(self.make_args(init=True))
@@ -199,27 +202,29 @@
     def test_config_set_tftp_port_sets_tftp_port(self):
         expected = factory.pick_port()
         cluster_config_command.run(self.make_args(tftp_port=expected))
-        observed = get_config_cluster_variable(CLUSTER_CONFIG.DB_tftpport)
+        with ClusterConfiguration.open() as config:
+            observed = config.tftp_port
         self.assertEqual(expected, observed)
 
     def test_config_set_tftp_port_without_setting_does_nothing(self):
-        expected = get_config_cluster_variable(CLUSTER_CONFIG.DB_tftpport)
+        with ClusterConfiguration.open() as config:
+            expected = config.tftp_port
         cluster_config_command.run(self.make_args(tftp_port=None))
-        observed = get_config_cluster_variable(CLUSTER_CONFIG.DB_tftpport)
+        with ClusterConfiguration.open() as config:
+            observed = config.tftp_port
         self.assertEqual(expected, observed)
 
     def test_config_set_tftp_port_sets_tftp_root(self):
         expected = self.make_dir()
         cluster_config_command.run(self.make_args(tftp_root=expected))
-        observed = get_config_cluster_variable(
-            CLUSTER_CONFIG.DB_tftp_resource_root)
+        with ClusterConfiguration.open() as config:
+            observed = config.tftp_root
         self.assertEqual(expected, observed)
 
     def test_config_set_tftp_root_without_setting_does_nothing(self):
-        expected = get_config_cluster_variable(
-            CLUSTER_CONFIG.DB_tftp_resource_root)
+        with ClusterConfiguration.open() as config:
+            expected = config.tftp_root
         cluster_config_command.run(self.make_args(tftp_root=None))
-        observed = get_config_cluster_variable(
-            CLUSTER_CONFIG.DB_tftp_resource_root)
-
+        with ClusterConfiguration.open() as config:
+            observed = config.tftp_root
         self.assertEqual(expected, observed)

=== modified file 'src/provisioningserver/tests/test_config.py'
--- src/provisioningserver/tests/test_config.py	2015-06-24 13:27:05 +0000
+++ src/provisioningserver/tests/test_config.py	2015-07-03 11:18:28 +0000
@@ -15,25 +15,19 @@
 __all__ = []
 
 import contextlib
-from copy import deepcopy
-import errno
-from functools import partial
-from getpass import getuser
-from io import BytesIO
 from operator import methodcaller
 import os.path
 import random
 import re
 import sqlite3
-from textwrap import dedent
 from uuid import uuid4
 
 from fixtures import EnvironmentVariableFixture
 import formencode
 import formencode.validators
 from formencode.validators import Invalid
-from maastesting import root
 from maastesting.factory import factory
+from maastesting.fixtures import ImportErrorFixture
 from maastesting.matchers import (
     MockCalledOnceWith,
     MockNotCalled,
@@ -41,11 +35,7 @@
 from maastesting.testcase import MAASTestCase
 from mock import sentinel
 from provisioningserver.config import (
-    BootSources,
     ClusterConfiguration,
-    Config,
-    ConfigBase,
-    ConfigMeta,
     Configuration,
     ConfigurationDatabase,
     ConfigurationFile,
@@ -53,20 +43,18 @@
     ConfigurationOption,
     Directory,
     ExtendedURL,
+    is_dev_environment,
     UUID,
 )
 from provisioningserver.path import get_path
-from provisioningserver.testing.config import ConfigFixtureBase
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.utils.fs import FileLockProxy
 from testtools import ExpectedException
 from testtools.matchers import (
-    DirExists,
     FileContains,
     FileExists,
     Is,
-    MatchesException,
     MatchesStructure,
-    Raises,
 )
 from twisted.python.filepath import FilePath
 import yaml
@@ -224,444 +212,6 @@
                              "url: %s" % url)
 
 
-class ExampleConfig(ConfigBase, formencode.Schema):
-    """An example configuration schema.
-
-    It derives from :class:`ConfigBase` and has a metaclass derived from
-    :class:`ConfigMeta`, just as a "real" schema must.
-    """
-
-    class __metaclass__(ConfigMeta):
-        envvar = "MAAS_TESTING_SETTINGS"
-        default = "example.yaml"
-
-    something = formencode.validators.String(if_missing="*missing*")
-
-
-class ExampleConfigFixture(ConfigFixtureBase):
-    """A fixture to help with testing :class:`ExampleConfig`."""
-
-    schema = ExampleConfig
-
-
-class TestConfigFixtureBase(MAASTestCase):
-    """Tests for `ConfigFixtureBase`."""
-
-    def exercise_fixture(self, fixture):
-        # ConfigFixtureBase arranges a minimal configuration on disk,
-        # and exports the configuration filename to the environment so
-        # that subprocesses can find it.
-        with fixture:
-            self.assertThat(fixture.dir, DirExists())
-            self.assertThat(fixture.filename, FileExists())
-            self.assertEqual(
-                {fixture.schema.envvar: fixture.filename},
-                fixture.environ)
-            self.assertEqual(
-                fixture.filename, os.environ[fixture.schema.envvar])
-            with open(fixture.filename, "rb") as stream:
-                self.assertEqual(fixture.config, yaml.safe_load(stream))
-
-    def test_use_minimal(self):
-        # With no arguments, ConfigFixtureBase arranges a minimal
-        # configuration.
-        fixture = ExampleConfigFixture()
-        self.exercise_fixture(fixture)
-
-    def test_use_with_config(self):
-        # Given a configuration, ConfigFixtureBase can arrange a minimal
-        # global configuration with the additional options merged in.
-        something = self.getUniqueString("something")
-        fixture = ExampleConfigFixture({"something": something})
-        self.assertEqual(something, fixture.config["something"])
-        self.exercise_fixture(fixture)
-
-
-class TestConfigMeta_DEFAULT_FILENAME(MAASTestCase):
-    """Tests for `provisioningserver.config.ConfigBase.DEFAULT_FILENAME`."""
-
-    def set_envvar(self, filepath=None):
-        """Continue this test with a given environment variable."""
-        self.useFixture(EnvironmentVariableFixture(
-            ExampleConfig.envvar, filepath))
-
-    def set_MAAS_CONFIG_DIR(self, dirpath=None):
-        """Continue this test with a given `MAAS_CONFIG_DIR`."""
-        self.useFixture(EnvironmentVariableFixture("MAAS_CONFIG_DIR", dirpath))
-
-    def make_config(self):
-        """Create a config file in a directory of its own."""
-        return self.make_file(name=ExampleConfig.default)
-
-    def test_gets_filename_from_MAAS_PROVISIONING_SETTNGS(self):
-        dummy_filename = factory.make_name("config")
-        self.set_MAAS_CONFIG_DIR(None)
-        self.set_envvar(dummy_filename)
-        self.assertEqual(dummy_filename, ExampleConfig.DEFAULT_FILENAME)
-
-    def test_falls_back_to_MAAS_CONFIG_DIR(self):
-        config_file = self.make_config()
-        self.set_MAAS_CONFIG_DIR(os.path.dirname(config_file))
-        self.set_envvar(None)
-        self.assertEqual(config_file, ExampleConfig.DEFAULT_FILENAME)
-
-    def test_MAAS_PROVISIONING_SETTINGS_trumps_MAAS_CONFIG_DIR(self):
-        provisioning_settings = factory.make_name("config")
-        self.set_MAAS_CONFIG_DIR(os.path.dirname(self.make_config()))
-        self.set_envvar(provisioning_settings)
-        self.assertEqual(
-            provisioning_settings,
-            ExampleConfig.DEFAULT_FILENAME)
-
-    def test_defaults_to_global_config(self):
-        self.set_MAAS_CONFIG_DIR(None)
-        self.set_envvar(None)
-        self.assertEqual(
-            '/etc/maas/%s' % ExampleConfig.default,
-            ExampleConfig.DEFAULT_FILENAME)
-
-    def test_set(self):
-        dummy_filename = factory.make_name("config")
-        ExampleConfig.DEFAULT_FILENAME = dummy_filename
-        self.assertEqual(dummy_filename, ExampleConfig.DEFAULT_FILENAME)
-
-    def test_delete(self):
-        self.set_MAAS_CONFIG_DIR(None)
-        self.set_envvar(None)
-        ExampleConfig.DEFAULT_FILENAME = factory.make_name("config")
-        del ExampleConfig.DEFAULT_FILENAME
-        # The filename reverts; see test_get_with_environment_empty.
-        self.assertEqual(
-            "/etc/maas/%s" % ExampleConfig.default,
-            ExampleConfig.DEFAULT_FILENAME)
-        # The delete does not fail when called multiple times.
-        del ExampleConfig.DEFAULT_FILENAME
-
-
-class TestConfigBase(MAASTestCase):
-    """Tests for `provisioningserver.config.ConfigBase`."""
-
-    def make_config_data(self):
-        """Return random config data for `ExampleConfig`."""
-        return {'something': factory.make_name('value')}
-
-    def make_config_file(self, name=None, data=None):
-        """Write a YAML config file, and return its path."""
-        if name is None:
-            name = factory.make_name('config') + '.yaml'
-        if data is None:
-            data = self.make_config_data()
-        return self.make_file(name=name, contents=yaml.safe_dump(data))
-
-    def test_get_defaults_returns_default_config(self):
-        # The default configuration is production-ready.
-        observed = ExampleConfig.get_defaults()
-        self.assertEqual({"something": "*missing*"}, observed)
-
-    def test_get_defaults_ignores_settings(self):
-        self.useFixture(ExampleConfigFixture(self.make_config_data()))
-        observed = ExampleConfig.get_defaults()
-        self.assertEqual({"something": "*missing*"}, observed)
-
-    def test_parse(self):
-        # Configuration can be parsed from a snippet of YAML.
-        observed = ExampleConfig.parse(b'something: "important"\n')
-        self.assertEqual("important", observed["something"])
-
-    def test_load(self):
-        # Configuration can be loaded and parsed from a file.
-        config = dedent("""
-            something: "important"
-            """)
-        filename = self.make_file(contents=config)
-        observed = ExampleConfig.load(filename)
-        self.assertEqual({"something": "important"}, observed)
-
-    def test_load_defaults_to_default_filename(self):
-        data = self.make_config_data()
-        filename = self.make_config_file(name='config.yaml', data=data)
-        self.patch(ExampleConfig, 'DEFAULT_FILENAME', filename)
-        self.assertEqual(data, ExampleConfig.load())
-
-    def test_load_from_cache_loads_config(self):
-        data = self.make_config_data()
-        filename = self.make_config_file(data=data)
-        self.assertEqual(data, ExampleConfig.load_from_cache(filename))
-
-    def test_load_from_cache_uses_defaults(self):
-        filename = self.make_file(contents='')
-        self.assertEqual(
-            ExampleConfig.get_defaults(),
-            ExampleConfig.load_from_cache(filename))
-
-    def test_load_from_cache_caches_each_file_separately(self):
-        config1 = self.make_file(contents=yaml.safe_dump({'something': "1"}))
-        config2 = self.make_file(contents=yaml.safe_dump({'something': "2"}))
-
-        self.assertEqual(
-            {"something": "1"},
-            ExampleConfig.load_from_cache(config1))
-        self.assertEqual(
-            {"something": "2"},
-            ExampleConfig.load_from_cache(config2))
-
-    def test_load_from_cache_reloads_from_cache_not_from_file(self):
-        # A config loaded by Config.load_from_cache() is never reloaded.
-        filename = self.make_config_file()
-        config_before = ExampleConfig.load_from_cache(filename)
-        os.unlink(filename)
-        config_after = ExampleConfig.load_from_cache(filename)
-        self.assertEqual(config_before, config_after)
-
-    def test_load_from_cache_caches_immutable_copy(self):
-        filename = self.make_config_file()
-
-        first_load = ExampleConfig.load_from_cache(filename)
-        second_load = ExampleConfig.load_from_cache(filename)
-
-        self.assertEqual(first_load, second_load)
-        self.assertIsNot(first_load, second_load)
-        first_load['something'] = factory.make_name('newthing')
-        self.assertNotEqual(first_load['something'], second_load['something'])
-
-    def test_flush_cache_without_filename_empties_cache(self):
-        filename = self.make_config_file()
-        ExampleConfig.load_from_cache(filename)
-        os.unlink(filename)
-        ExampleConfig.flush_cache()
-        error = self.assertRaises(
-            IOError,
-            ExampleConfig.load_from_cache, filename)
-        self.assertEqual(errno.ENOENT, error.errno)
-
-    def test_flush_cache_flushes_specific_file(self):
-        filename = self.make_config_file()
-        ExampleConfig.load_from_cache(filename)
-        os.unlink(filename)
-        ExampleConfig.flush_cache(filename)
-        error = self.assertRaises(
-            IOError,
-            ExampleConfig.load_from_cache, filename)
-        self.assertEqual(errno.ENOENT, error.errno)
-
-    def test_flush_cache_retains_other_files(self):
-        flushed_file = self.make_config_file()
-        cached_file = self.make_config_file()
-        ExampleConfig.load_from_cache(flushed_file)
-        cached_config = ExampleConfig.load_from_cache(cached_file)
-        os.unlink(cached_file)
-        ExampleConfig.flush_cache(flushed_file)
-        self.assertEqual(
-            cached_config,
-            ExampleConfig.load_from_cache(cached_file))
-
-    def test_flush_cache_ignores_uncached_files(self):
-        data = self.make_config_data()
-        filename = self.make_config_file(data=data)
-        ExampleConfig.flush_cache(filename)
-        self.assertEqual(data, ExampleConfig.load_from_cache(filename))
-
-    def test_field(self):
-        self.assertIs(ExampleConfig, ExampleConfig.field())
-        self.assertIs(
-            ExampleConfig.fields["something"],
-            ExampleConfig.field("something"))
-
-    def test_save_and_load_interoperate(self):
-        something = self.getUniqueString()
-        saved_file = self.make_file()
-
-        ExampleConfig.save({'something': something}, saved_file)
-        loaded_config = ExampleConfig.load(saved_file)
-        self.assertEqual(something, loaded_config['something'])
-
-    def test_save_saves_yaml_file(self):
-        config = {'something': self.getUniqueString()}
-        saved_file = self.make_file()
-
-        ExampleConfig.save(config, saved_file)
-
-        with open(saved_file, 'rb') as written_file:
-            loaded_config = yaml.safe_load(written_file)
-        self.assertEqual(config, loaded_config)
-
-    def test_save_defaults_to_default_filename(self):
-        something = self.getUniqueString()
-        filename = self.make_file(name="config.yaml")
-        self.patch(ExampleConfig, 'DEFAULT_FILENAME', filename)
-
-        ExampleConfig.save({'something': something})
-
-        self.assertEqual(
-            {'something': something},
-            ExampleConfig.load(filename))
-
-    def test_create_backup_creates_backup(self):
-        something = self.getUniqueString()
-        filename = self.make_file(name="config.yaml")
-        config = {'something': something}
-        yaml_config = yaml.safe_dump(config)
-        self.patch(ExampleConfig, 'DEFAULT_FILENAME', filename)
-        ExampleConfig.save(config)
-
-        ExampleConfig.create_backup('test')
-
-        backup_name = "%s.%s.bak" % (filename, 'test')
-        self.assertThat(backup_name, FileContains(yaml_config))
-
-
-class TestConfig(MAASTestCase):
-    """Tests for `provisioningserver.config.Config`."""
-
-    default_production_config = {
-        'broker': {
-            'host': 'localhost',
-            'port': 5673,
-            'username': getuser(),
-            'password': 'test',
-            'vhost': '/',
-        },
-        'logfile': 'pserv.log',
-        'oops': {
-            'directory': '',
-            'reporter': '',
-        },
-        'rpc': {},
-        'tftp': {
-            'generator': 'http://localhost/MAAS/api/1.0/pxeconfig/',
-            'port': 69,
-            # The "root" setting is obsolete; resource_root replaces it.
-            'root': "/var/lib/maas/tftp",
-            'resource_root': "/var/lib/maas/boot-resources/current/",
-        },
-        # Legacy section.  Became unused in MAAS 1.5.
-        'boot': {
-            'architectures': None,
-            'ephemeral': {
-                'images_directory': None,
-                'releases': None,
-            },
-        },
-    }
-
-    default_development_config = deepcopy(default_production_config)
-    default_development_config.update(logfile="/dev/null")
-    default_development_config["tftp"].update(
-        port=5244, generator="http://localhost:5240/MAAS/api/1.0/pxeconfig/")
-
-    def test_get_defaults_returns_default_config(self):
-        # The default configuration is production-ready.
-        observed = Config.get_defaults()
-        self.assertEqual(self.default_production_config, observed)
-
-    def test_load_example(self):
-        # The example configuration is designed for development.
-        filename = os.path.join(root, "etc", "maas", "pserv.yaml")
-        self.assertEqual(
-            self.default_development_config,
-            Config.load(filename))
-
-    def test_oops_directory_without_reporter(self):
-        # It is an error to omit the OOPS reporter if directory is specified.
-        config = (
-            'oops:\n'
-            '  directory: /tmp/oops\n'
-        )
-        expected = MatchesException(
-            formencode.Invalid, "oops: You must give a value for reporter")
-        self.assertThat(
-            partial(Config.parse, config),
-            Raises(expected))
-
-    def test_accepts_1_4_config_file(self):
-        # A config file that was valid with MAAS 1.4 still loads, even though
-        # its "boot" section is no longer used.
-        broker_password = factory.make_name('pass')
-        config = Config.parse(dedent("""\
-            logfile: "/dev/null"
-            oops:
-              directory: "logs/oops"
-              reporter: "maas-pserv"
-            broker:
-              host: "localhost"
-              port: 5673
-              username: brokeruser
-              password: "%s"
-              vhost: "/"
-            tftp:
-              root: /var/lib/maas/tftp
-              port: 5244
-              generator: http://localhost:5240/api/1.0/pxeconfig/
-            boot:
-              architectures: ['i386', 'armhf']
-              ephemeral:
-                images_directory: /var/lib/maas/ephemeral
-                releases: ['precise', 'saucy']
-            """) % broker_password)
-        # This does not fail.
-        self.assertEqual(broker_password, config['broker']['password'])
-
-
-class TestBootSources(MAASTestCase):
-    """Tests for `provisioningserver.config.BootSources`."""
-
-    default_source = {
-        'url': (
-            'http://maas.ubuntu.com/images/ephemeral-v2/releases/'
-        ),
-        'keyring': (
-            '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'),
-        'keyring_data': None,
-        'selections': [
-            {
-                'os': '*',
-                'release': '*',
-                'labels': ['*'],
-                'arches': ['*'],
-                'subarches': ['*'],
-            },
-        ],
-    }
-
-    def make_source(self):
-        """Create a dict defining an arbitrary `BootSource`."""
-        return {
-            'url': 'http://example.com/' + factory.make_name('path'),
-            'keyring': factory.make_name('keyring'),
-            'keyring_data': factory.make_string(),
-            'selections': [{
-                'os': factory.make_name('os'),
-                'release': factory.make_name('release'),
-                'labels': [factory.make_name('label')],
-                'arches': [factory.make_name('arch')],
-                'subarches': [factory.make_name('sub') for _ in range(3)],
-            }],
-        }
-
-    def test_parse_parses_source(self):
-        sources = [self.make_source()]
-        self.assertEqual(
-            sources,
-            BootSources.parse(BytesIO(yaml.safe_dump(sources))))
-
-    def test_parse_parses_multiple_sources(self):
-        sources = [self.make_source() for _ in range(2)]
-        self.assertEqual(
-            sources,
-            BootSources.parse(BytesIO(yaml.safe_dump(sources))))
-
-    def test_parse_uses_defaults(self):
-        self.assertEqual(
-            [self.default_source],
-            BootSources.parse(BytesIO(b'[{}]')))
-
-    def test_load_parses_file(self):
-        sources = [self.make_source()]
-        self.assertEqual(
-            sources,
-            BootSources.load(self.make_file(contents=yaml.safe_dump(sources))))
-
-
 ###############################################################################
 # New configuration API follows.
 ###############################################################################
@@ -1153,9 +703,12 @@
         self.assertEqual({"tftp_port": example_port}, config.store)
 
     def test_default_tftp_root(self):
+        maas_root = os.getenv("MAAS_ROOT")
+        self.assertIsNotNone(maas_root)
         config = ClusterConfiguration({})
         self.assertEqual(
-            "/var/lib/maas/boot-resources/current/", config.tftp_root)
+            os.path.join(maas_root, "var/lib/maas/boot-resources/current"),
+            config.tftp_root)
 
     def test_set_and_get_tftp_root(self):
         config = ClusterConfiguration({})
@@ -1164,3 +717,62 @@
         self.assertEqual(example_dir, config.tftp_root)
         # It's also stored in the configuration database.
         self.assertEqual({"tftp_root": example_dir}, config.store)
+
+    def test_default_cluster_uuid(self):
+        config = ClusterConfiguration({})
+        self.assertEqual("** UUID NOT SET **", config.cluster_uuid)
+
+    def test_set_and_get_cluster_uuid(self):
+        example_uuid = uuid4()
+        config = ClusterConfiguration({})
+        config.cluster_uuid = example_uuid
+        self.assertEqual(unicode(example_uuid), config.cluster_uuid)
+        # It's also stored in the configuration database.
+        self.assertEqual({"cluster_uuid": unicode(example_uuid)}, config.store)
+
+
+class TestClusterConfigurationTFTPGeneratorURL(MAASTestCase):
+    """Tests for `ClusterConfiguration.tftp_generator_url`."""
+
+    def test__is_relative_to_maas_url(self):
+        random_url = factory.make_simple_http_url()
+        self.useFixture(ClusterConfigurationFixture(maas_url=random_url))
+        with ClusterConfiguration.open() as configuration:
+            self.assertEqual(
+                random_url + "/api/1.0/pxeconfig/",
+                configuration.tftp_generator_url)
+
+    def test__strips_trailing_slashes_from_maas_url(self):
+        random_url = factory.make_simple_http_url(path="foobar/")
+        self.useFixture(ClusterConfigurationFixture(maas_url=random_url))
+        with ClusterConfiguration.open() as configuration:
+            self.assertEqual(
+                random_url.rstrip("/") + "/api/1.0/pxeconfig/",
+                configuration.tftp_generator_url)
+
+
+class TestClusterConfigurationGRUBRoot(MAASTestCase):
+    """Tests for `ClusterConfiguration.grub_root`."""
+
+    def test__is_relative_to_tftp_root_without_trailing_slash(self):
+        random_dir = self.make_dir().rstrip("/")
+        self.useFixture(ClusterConfigurationFixture(tftp_root=random_dir))
+        with ClusterConfiguration.open() as configuration:
+            self.assertEqual(random_dir + "/grub", configuration.grub_root)
+
+    def test__is_relative_to_tftp_root_with_trailing_slash(self):
+        random_dir = self.make_dir().rstrip("/") + "/"
+        self.useFixture(ClusterConfigurationFixture(tftp_root=random_dir))
+        with ClusterConfiguration.open() as configuration:
+            self.assertEqual(random_dir + "grub", configuration.grub_root)
+
+
+class TestConfig(MAASTestCase):
+    """Tests for `maasserver.config`."""
+
+    def test_is_dev_environment_returns_false(self):
+        self.useFixture(ImportErrorFixture('maastesting', 'root'))
+        self.assertFalse(is_dev_environment())
+
+    def test_is_dev_environment_returns_true(self):
+        self.assertTrue(is_dev_environment())

=== removed file 'src/provisioningserver/tests/test_configure_maas_url.py'
--- src/provisioningserver/tests/test_configure_maas_url.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/tests/test_configure_maas_url.py	1970-01-01 00:00:00 +0000
@@ -1,351 +0,0 @@
-# Copyright 2014-2015 Canonical Ltd.  This software is licensed under the
-# GNU Affero General Public License version 3 (see the file LICENSE).
-
-"""Tests for `MAAS_URL` configuration update code."""
-
-from __future__ import (
-    absolute_import,
-    print_function,
-    unicode_literals,
-    )
-
-str = None
-
-__metaclass__ = type
-__all__ = []
-
-from argparse import ArgumentParser
-from random import randint
-from textwrap import dedent
-
-from maastesting.factory import factory
-from maastesting.matchers import (
-    MockAnyCall,
-    MockCalledOnceWith,
-)
-from maastesting.testcase import MAASTestCase
-from mock import (
-    ANY,
-    Mock,
-)
-from provisioningserver import configure_maas_url
-from provisioningserver.configure_maas_url import substitute_pserv_yaml_line
-from testtools.matchers import (
-    FileContains,
-    StartsWith,
-)
-
-
-class TestRewriteConfigFile(MAASTestCase):
-
-    def test__rewrites_file(self):
-        path = self.make_file(contents='foo\n')
-        configure_maas_url.rewrite_config_file(path, lambda line: 'bar')
-        self.assertThat(path, FileContains('bar\n'))
-
-    def test__sets_access_permissions(self):
-        writer = self.patch(configure_maas_url, 'atomic_write')
-        mode = 0215
-        path = self.make_file()
-        configure_maas_url.rewrite_config_file(
-            path, lambda line: line, mode=mode)
-        self.assertThat(writer, MockCalledOnceWith(ANY, path, mode=mode))
-
-    def test__preserves_trailing_newline(self):
-        path = self.make_file(contents='x\n')
-        configure_maas_url.rewrite_config_file(path, lambda line: line)
-        self.assertThat(path, FileContains('x\n'))
-
-    def test__ensures_trailing_newline(self):
-        path = self.make_file(contents='x')
-        configure_maas_url.rewrite_config_file(path, lambda line: line)
-        self.assertThat(path, FileContains('x\n'))
-
-
-class TestUpdateMAASClusterConf(MAASTestCase):
-
-    def patch_file(self, content):
-        """Inject a fake `/etc/maas/maas_cluster.conf`."""
-        path = self.make_file(name='maas_cluster.conf', contents=content)
-        self.patch(configure_maas_url, 'MAAS_CLUSTER_CONF', path)
-        return path
-
-    def test__updates_realistic_file(self):
-        config_file = self.patch_file(dedent("""\
-            # Leading comments.
-            MAAS_URL="http://10.9.8.7/MAAS"
-            CLUSTER_UUID="5d02950e-6318-8195-ac3e-e6ccb12673c5"
-            """))
-        configure_maas_url.update_maas_cluster_conf('http://1.2.3.4/MAAS')
-        self.assertThat(
-            config_file,
-            FileContains(dedent("""\
-                # Leading comments.
-                MAAS_URL="http://1.2.3.4/MAAS"
-                CLUSTER_UUID="5d02950e-6318-8195-ac3e-e6ccb12673c5"
-                """)))
-
-    def test__updates_quoted_value(self):
-        old_url = factory.make_url()
-        new_url = factory.make_url()
-        config_file = self.patch_file('MAAS_URL="%s"\n' % old_url)
-        configure_maas_url.update_maas_cluster_conf(new_url)
-        self.assertThat(
-            config_file,
-            FileContains('MAAS_URL="%s"\n' % new_url))
-
-    def test__updates_unquoted_value(self):
-        old_url = factory.make_url()
-        new_url = factory.make_url()
-        config_file = self.patch_file('MAAS_URL=%s\n' % old_url)
-        configure_maas_url.update_maas_cluster_conf(new_url)
-        self.assertThat(
-            config_file,
-            FileContains('MAAS_URL="%s"\n' % new_url))
-
-    def test__leaves_other_lines_unchanged(self):
-        old_content = '#MAAS_URL="%s"\n' % factory.make_url()
-        config_file = self.patch_file(old_content)
-        configure_maas_url.update_maas_cluster_conf(factory.make_url())
-        self.assertThat(config_file, FileContains(old_content))
-
-
-class TestExtractHost(MAASTestCase):
-
-    def test__extracts_hostname(self):
-        host = factory.make_name('host').lower()
-        port = factory.pick_port()
-        self.assertEqual(
-            host,
-            configure_maas_url.extract_host('http://%s/path' % host))
-        self.assertEqual(
-            host,
-            configure_maas_url.extract_host('http://%s:%d' % (host, port)))
-
-    def test__extracts_IPv4_address(self):
-        host = factory.make_ipv4_address()
-        port = factory.pick_port()
-        self.assertEqual(
-            host,
-            configure_maas_url.extract_host('http://%s' % host))
-        self.assertEqual(
-            host,
-            configure_maas_url.extract_host('http://%s:%d' % (host, port)))
-
-    def test__extracts_IPv6_address(self):
-        host = factory.make_ipv6_address()
-        port = factory.pick_port()
-        self.assertEqual(
-            host,
-            configure_maas_url.extract_host('http://[%s]' % host))
-        self.assertEqual(
-            host,
-            configure_maas_url.extract_host('http://[%s]:%d' % (host, port)))
-
-    def test__extracts_IPv6_address_with_zone_index(self):
-        host = (
-            factory.make_ipv6_address() +
-            '%25' +
-            factory.make_name('zone').lower())
-        port = factory.pick_port()
-        self.assertEqual(
-            host,
-            configure_maas_url.extract_host('http://[%s]' % host))
-        self.assertEqual(
-            host,
-            configure_maas_url.extract_host('http://[%s]:%d' % (host, port)))
-
-
-class TestSubstitutePservYamlLine(MAASTestCase):
-
-    def make_generator_line(self, url):
-        return "  generator: %s" % url
-
-    def test__replaces_hostname_generator_URL(self):
-        old_host = factory.make_name('old-host')
-        new_host = factory.make_name('new-host')
-        input_line = self.make_generator_line('http://%s' % old_host)
-        self.assertEqual(
-            self.make_generator_line('http://%s' % new_host),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__replaces_IPv4_generator_URL(self):
-        old_host = factory.make_ipv4_address()
-        new_host = factory.make_name('new-host')
-        input_line = self.make_generator_line('http://%s' % old_host)
-        self.assertEqual(
-            self.make_generator_line('http://%s' % new_host),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__replaces_IPv6_generator_URL(self):
-        old_host = factory.make_ipv6_address()
-        new_host = factory.make_name('new-host')
-        input_line = self.make_generator_line('http://[%s]' % old_host)
-        self.assertEqual(
-            self.make_generator_line('http://%s' % new_host),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__replaces_IPv6_generator_URL_with_zone_index(self):
-        old_host = (
-            factory.make_ipv6_address() +
-            '%25' +
-            factory.make_name('zone')
-            )
-        new_host = factory.make_name('new-host')
-        input_line = self.make_generator_line('http://[%s]' % old_host)
-        self.assertEqual(
-            self.make_generator_line('http://%s' % new_host),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__inserts_IPv6_with_brackets(self):
-        old_host = factory.make_name('old-host')
-        new_host = '[%s]' % factory.make_ipv6_address()
-        input_line = self.make_generator_line('http://%s' % old_host)
-        self.assertEqual(
-            self.make_generator_line('http://%s' % new_host),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__inserts_IPv6_without_brackets(self):
-        old_host = factory.make_name('old-host')
-        new_host = factory.make_ipv6_address()
-        input_line = self.make_generator_line('http://%s' % old_host)
-        self.assertEqual(
-            self.make_generator_line('http://[%s]' % new_host),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__preserves_port_after_simple_host(self):
-        port = factory.pick_port()
-        old_host = factory.make_name('old-host')
-        new_host = factory.make_name('new-host')
-        input_line = self.make_generator_line(
-            'http://%s:%d' % (old_host, port))
-        self.assertEqual(
-            self.make_generator_line('http://%s:%d' % (new_host, port)),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__preserves_port_with_IPv6(self):
-        port = factory.pick_port()
-        old_host = factory.make_ipv6_address()
-        new_host = factory.make_name('new-host')
-        input_line = self.make_generator_line(
-            'http://[%s]:%d' % (old_host, port))
-        self.assertEqual(
-            self.make_generator_line('http://%s:%d' % (new_host, port)),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__preserves_port_with_IPv6_and_zone_index(self):
-        port = factory.pick_port()
-        old_host = (
-            factory.make_ipv6_address() +
-            '%25' +
-            factory.make_name('zone')
-            )
-        new_host = factory.make_name('new-host')
-        input_line = self.make_generator_line(
-            'http://[%s]:%d' % (old_host, port))
-        self.assertEqual(
-            self.make_generator_line('http://%s:%d' % (new_host, port)),
-            substitute_pserv_yaml_line(new_host, input_line))
-
-    def test__preserves_other_line(self):
-        line = '#' + self.make_generator_line(factory.make_url())
-        self.assertEqual(
-            line,
-            substitute_pserv_yaml_line(factory.make_name('host'), line))
-
-    def test__preserves_indentation(self):
-        spaces = ' ' * randint(0, 10)
-        input_line = spaces + 'generator: %s' % factory.make_url()
-        output_line = substitute_pserv_yaml_line(
-            factory.make_name('host'), input_line)
-        self.assertThat(output_line, StartsWith(spaces + 'generator:'))
-
-    def test__preserves_trailing_comments(self):
-        comment = " # Trailing comment."
-        old_host = factory.make_name('old-host')
-        new_host = factory.make_name('new-host')
-        input_line = self.make_generator_line('http://%s' % old_host) + comment
-        self.assertEqual(
-            self.make_generator_line('http://%s' % new_host) + comment,
-            substitute_pserv_yaml_line(new_host, input_line))
-
-
-class TestUpdatePservYaml(MAASTestCase):
-
-    def patch_file(self, content):
-        """Inject a fake `/etc/maas/pserv.yaml`."""
-        path = self.make_file(name='pserv.yaml', contents=content)
-        self.patch(configure_maas_url, 'PSERV_YAML', path)
-        return path
-
-    def test__updates_realistic_file(self):
-        old_host = factory.make_name('old-host')
-        new_host = factory.make_name('new-host')
-        config_file = self.patch_file(dedent("""\
-            ## TFTP configuration.
-            tftp:
-              ## The URL to be contacted to generate PXE configurations.
-              generator: http://%s/MAAS/api/1.0/pxeconfig/
-            """) % old_host)
-        configure_maas_url.update_pserv_yaml(new_host)
-        self.assertThat(
-            config_file,
-            FileContains(dedent("""\
-                ## TFTP configuration.
-                tftp:
-                  ## The URL to be contacted to generate PXE configurations.
-                  generator: http://%s/MAAS/api/1.0/pxeconfig/
-                """) % new_host))
-
-
-class TestAddArguments(MAASTestCase):
-
-    def test__accepts_maas_url(self):
-        url = factory.make_url()
-        parser = ArgumentParser()
-        configure_maas_url.add_arguments(parser)
-        args = parser.parse_args([url])
-        self.assertEqual(url, args.maas_url)
-
-
-class TestRun(MAASTestCase):
-
-    def make_args(self, maas_url):
-        args = Mock()
-        args.maas_url = maas_url
-        return args
-
-    def patch_read_file(self):
-        return self.patch(configure_maas_url, 'read_text_file')
-
-    def patch_write_file(self):
-        return self.patch(configure_maas_url, 'atomic_write')
-
-    def test__updates_maas_cluster_conf(self):
-        reader = self.patch_read_file()
-        writer = self.patch_write_file()
-        url = factory.make_url()
-        configure_maas_url.run(self.make_args(url))
-        self.assertThat(reader, MockAnyCall('/etc/maas/maas_cluster.conf'))
-        self.assertThat(
-            writer,
-            MockAnyCall(ANY, '/etc/maas/maas_cluster.conf', mode=0640))
-
-    def test__updates_pserv_yaml(self):
-        reader = self.patch_read_file()
-        writer = self.patch_write_file()
-        url = factory.make_url()
-        configure_maas_url.run(self.make_args(url))
-        self.assertThat(reader, MockAnyCall('/etc/maas/pserv.yaml'))
-        self.assertThat(
-            writer,
-            MockAnyCall(ANY, '/etc/maas/pserv.yaml', mode=0644))
-
-    def test__passes_host_to_update_pserv_yaml(self):
-        self.patch_read_file()
-        self.patch_write_file()
-        update_pserv_yaml = self.patch(configure_maas_url, 'update_pserv_yaml')
-        host = factory.make_name('host').lower()
-        url = factory.make_url(netloc=host)
-        configure_maas_url.run(self.make_args(url))
-        self.assertThat(update_pserv_yaml, MockCalledOnceWith(host))

=== modified file 'src/provisioningserver/tests/test_diskless.py'
--- src/provisioningserver/tests/test_diskless.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/tests/test_diskless.py	2015-07-03 11:18:28 +0000
@@ -24,10 +24,8 @@
 )
 from maastesting.testcase import MAASTestCase
 from mock import sentinel
-from provisioningserver import (
-    config,
-    diskless,
-)
+from provisioningserver import diskless
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.diskless import (
     compose_diskless_link_path,
     compose_diskless_tgt_config,
@@ -54,6 +52,7 @@
     BOOT_IMAGE_PURPOSE,
     OperatingSystemRegistry,
 )
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.testing.os import FakeOS
 from provisioningserver.utils.testing import RegistryFixture
 from testtools.matchers import (
@@ -71,13 +70,17 @@
 
     def setUp(self):
         super(DisklessTestMixin, self).setUp()
+        self.useFixture(ClusterConfigurationFixture())
         # Ensure the global registry is empty for each test run.
         self.useFixture(RegistryFixture())
 
     def configure_resource_storage(self):
         resource_dir = self.make_dir()
         os.mkdir(os.path.join(resource_dir, 'diskless'))
-        self.patch(config, 'BOOT_RESOURCES_STORAGE', resource_dir)
+        current_dir = os.path.join(resource_dir, 'current') + '/'
+        os.mkdir(current_dir)
+        with ClusterConfiguration.open() as config:
+            config.tftp_root = current_dir
         return resource_dir
 
     def configure_diskless_storage(self):
@@ -113,11 +116,14 @@
         self.patch(diskless, 'reload_diskless_tgt')
 
 
-class TestHelpers(MAASTestCase, DisklessTestMixin):
+class TestHelpers(DisklessTestMixin, MAASTestCase):
 
     def test_get_diskless_store(self):
-        storage_dir = factory.make_name('storage')
-        self.patch(config, 'BOOT_RESOURCES_STORAGE', storage_dir)
+        storage_dir = self.make_dir()
+        current_dir = os.path.join(storage_dir, 'current') + '/'
+        os.mkdir(current_dir)
+        with ClusterConfiguration.open() as config:
+            config.tftp_root = current_dir
         self.assertEqual(
             os.path.join(storage_dir, 'diskless', 'store'),
             get_diskless_store())
@@ -199,7 +205,7 @@
         self.assertRaises(DisklessError, get_diskless_driver, invalid_name)
 
 
-class TestTgtHelpers(MAASTestCase, DisklessTestMixin):
+class TestTgtHelpers(DisklessTestMixin, MAASTestCase):
 
     def test_get_diskless_target(self):
         system_id = factory.make_name('system_id')
@@ -269,10 +275,10 @@
         update_diskless_tgt()
         self.assertThat(
             mock_write,
-            MockCalledOnceWith(tgt_config, tgt_path, mode=0644))
-
-
-class TestComposeSourcePath(MAASTestCase, DisklessTestMixin):
+            MockCalledOnceWith(tgt_config, tgt_path, mode=0o644))
+
+
+class TestComposeSourcePath(DisklessTestMixin, MAASTestCase):
 
     def test__raises_error_on_missing_os_from_registry(self):
         self.assertRaises(
@@ -297,14 +303,15 @@
         osystem = OperatingSystemRegistry[os_name]
         mock_xi_params = self.patch(osystem, 'get_xinstall_parameters')
         mock_xi_params.return_value = (root_path, 'tgz')
+        with ClusterConfiguration.open() as config:
+            tftp_root = config.tftp_root
         self.assertEqual(
             os.path.join(
-                config.BOOT_RESOURCES_STORAGE, 'current', os_name,
-                arch, subarch, release, label, root_path),
+                tftp_root, os_name, arch, subarch, release, label, root_path),
             compose_source_path(os_name, arch, subarch, release, label))
 
 
-class TestCreateDisklessDisk(MAASTestCase, DisklessTestMixin):
+class TestCreateDisklessDisk(DisklessTestMixin, MAASTestCase):
 
     def test__raises_error_on_doesnt_exist_source_path(self):
         self.configure_compose_source_path(factory.make_name('invalid_path'))
@@ -408,7 +415,7 @@
         self.assertThat(mock_update_tgt, MockCalledOnceWith())
 
 
-class TestDeleteDisklessDisk(MAASTestCase, DisklessTestMixin):
+class TestDeleteDisklessDisk(DisklessTestMixin, MAASTestCase):
 
     def test__exits_early_on_missing_link(self):
         self.configure_diskless_storage()

=== modified file 'src/provisioningserver/tests/test_path.py'
--- src/provisioningserver/tests/test_path.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/tests/test_path.py	2015-07-03 11:18:28 +0000
@@ -73,6 +73,14 @@
             os.path.join(root, path),
             self.get_path_function(path))
 
+    def test__assumes_MAAS_ROOT_is_unset_if_empty(self):
+        self.set_root("")
+        self.patch(provisioningserver.path, 'ensure_dir')
+        path = factory.make_name('path')
+        self.assertEqual(
+            os.path.join("/", path),
+            self.get_path_function(path))
+
     def test__returns_absolute_path(self):
         self.set_root('.')
         self.patch(provisioningserver.path, 'ensure_dir')

=== modified file 'src/provisioningserver/tests/test_plugin.py'
--- src/provisioningserver/tests/test_plugin.py	2015-06-25 14:48:14 +0000
+++ src/provisioningserver/tests/test_plugin.py	2015-07-03 11:18:28 +0000
@@ -14,10 +14,6 @@
 __metaclass__ = type
 __all__ = []
 
-import os
-
-from fixtures import EnvironmentVariableFixture
-from maastesting.factory import factory
 from maastesting.matchers import MockCalledOnceWith
 from maastesting.testcase import (
     MAASTestCase,
@@ -25,6 +21,7 @@
 )
 import provisioningserver
 from provisioningserver import plugin as plugin_module
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.plugin import (
     Options,
     ProvisioningServiceMaker,
@@ -46,6 +43,7 @@
     TFTPBackend,
     TFTPService,
 )
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from testtools.matchers import (
     AfterPreprocessing,
     Equals,
@@ -54,7 +52,8 @@
     MatchesStructure,
 )
 from twisted.application.service import MultiService
-import yaml
+from twisted.python.filepath import FilePath
+from twisted.web.server import Site
 
 
 class TestOptions(MAASTestCase):
@@ -62,7 +61,7 @@
 
     def test_defaults(self):
         options = Options()
-        expected = {"config-file": "pserv.yaml", "introspect": None}
+        expected = {"introspect": None}
         self.assertEqual(expected, options.defaults)
 
     def test_parse_minimal_options(self):
@@ -79,17 +78,9 @@
 
     def setUp(self):
         super(TestProvisioningServiceMaker, self).setUp()
+        self.useFixture(ClusterConfigurationFixture())
         self.patch(provisioningserver, "services", MultiService())
         self.tempdir = self.make_dir()
-        self.useFixture(
-            EnvironmentVariableFixture(
-                "CLUSTER_UUID", factory.make_UUID()))
-
-    def write_config(self, config):
-        config_filename = os.path.join(self.tempdir, "config.yaml")
-        with open(config_filename, "wb") as stream:
-            yaml.safe_dump(config, stream)
-        return config_filename
 
     def test_init(self):
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
@@ -101,7 +92,6 @@
         Only the site service is created when no options are given.
         """
         options = Options()
-        options["config-file"] = self.write_config({})
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
         service = service_maker.makeService(options)
         self.assertIsInstance(service, MultiService)
@@ -120,7 +110,6 @@
         mock_simplestreams_patch = (
             self.patch(plugin_module, 'force_simplestreams_to_use_urllib2'))
         options = Options()
-        options["config-file"] = self.write_config({})
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
         service_maker.makeService(options)
         self.assertThat(mock_simplestreams_patch, MockCalledOnceWith())
@@ -129,14 +118,12 @@
         mock_tftp_patch = (
             self.patch(plugin_module, 'add_term_error_code_to_tftp'))
         options = Options()
-        options["config-file"] = self.write_config({})
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
         service_maker.makeService(options)
         self.assertThat(mock_tftp_patch, MockCalledOnceWith())
 
     def test_image_download_service(self):
         options = Options()
-        options["config-file"] = self.write_config({})
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
         service = service_maker.makeService(options)
         image_service = service.getServiceNamed("image_download")
@@ -144,7 +131,6 @@
 
     def test_node_monitor_service(self):
         options = Options()
-        options["config-file"] = self.write_config({})
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
         service = service_maker.makeService(options)
         node_monitor = service.getServiceNamed("node_monitor")
@@ -152,7 +138,6 @@
 
     def test_dhcp_probe_service(self):
         options = Options()
-        options["config-file"] = self.write_config({})
         service_maker = ProvisioningServiceMaker("Spike", "Milligan")
         service = service_maker.makeService(options)
         dhcp_probe = service.getServiceNamed("dhcp_probe")
@@ -160,7 +145,6 @@
 
     def test_service_monitor_service(self):
         options = Options()
-        options["config-file"] = self.write_config({})
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
         service = service_maker.makeService(options)
         service_monitor = service.getServiceNamed("service_monitor")
@@ -168,53 +152,44 @@
 
     def test_tftp_service(self):
         # A TFTP service is configured and added to the top-level service.
-        config = {
-            "tftp": {
-                "generator": "http://candlemass/solitude",
-                "resource_root": self.tempdir,
-                "port": factory.pick_port(),
-                },
-            }
         options = Options()
-        options["config-file"] = self.write_config(config)
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
         service = service_maker.makeService(options)
         tftp_service = service.getServiceNamed("tftp")
         self.assertIsInstance(tftp_service, TFTPService)
 
+        with ClusterConfiguration.open() as config:
+            tftp_generator_url = config.tftp_generator_url
+            tftp_root = config.tftp_root
+            tftp_port = config.tftp_port
+
         expected_backend = MatchesAll(
             IsInstance(TFTPBackend),
             AfterPreprocessing(
                 lambda backend: backend.base.path,
-                Equals(config["tftp"]["resource_root"])),
+                Equals(tftp_root)),
             AfterPreprocessing(
                 lambda backend: backend.generator_url.geturl(),
-                Equals(config["tftp"]["generator"])))
+                Equals(tftp_generator_url)))
 
         self.assertThat(
             tftp_service, MatchesStructure(
                 backend=expected_backend,
-                port=Equals(config["tftp"]["port"]),
+                port=Equals(tftp_port),
             ))
 
     def test_image_service(self):
-        from provisioningserver import config
-        from twisted.web.server import Site
-        from twisted.python.filepath import FilePath
-
         options = Options()
-        options["config-file"] = self.write_config({})
         service_maker = ProvisioningServiceMaker("Harry", "Hill")
         service = service_maker.makeService(options)
         image_service = service.getServiceNamed("image_service")
         self.assertIsInstance(image_service, BootImageEndpointService)
         self.assertIsInstance(image_service.site, Site)
         resource = image_service.site.resource
-        root = resource.getChildWithDefault(
-            "images", request=None)
+        root = resource.getChildWithDefault("images", request=None)
         self.assertThat(root, IsInstance(FilePath))
 
-        resource_root = os.path.join(
-            config.BOOT_RESOURCES_STORAGE, "current")
+        with ClusterConfiguration.open() as config:
+            resource_root = FilePath(config.tftp_root)
 
-        self.assertEqual(resource_root, root.path)
+        self.assertEqual(resource_root, root)

=== modified file 'src/provisioningserver/tests/test_tags.py'
--- src/provisioningserver/tests/test_tags.py	2015-05-07 18:14:38 +0000
+++ src/provisioningserver/tests/test_tags.py	2015-07-03 11:18:28 +0000
@@ -37,6 +37,7 @@
     sentinel,
 )
 from provisioningserver import tags
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.testing.testcase import PservTestCase
 from testtools.matchers import (
     DocTestMatches,
@@ -484,7 +485,7 @@
         self.useFixture(FakeLogger())
 
     def fake_client(self):
-        return MAASClient(None, None, self.make_maas_url())
+        return MAASClient(None, None, factory.make_simple_http_url())
 
     def fake_cached_knowledge(self):
         nodegroup_uuid = factory.make_name('nodegroupuuid')
@@ -592,7 +593,8 @@
             tags.classify(xpath, node_details))
 
     def test_process_node_tags_integration(self):
-        self.set_maas_url()
+        self.useFixture(ClusterConfigurationFixture(
+            maas_url=factory.make_simple_http_url()))
         get_nodes = FakeMethod(
             result=factory.make_response(
                 httplib.OK,

=== modified file 'src/provisioningserver/tests/test_upgrade_cluster.py'
--- src/provisioningserver/tests/test_upgrade_cluster.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/tests/test_upgrade_cluster.py	2015-07-03 11:18:28 +0000
@@ -27,11 +27,9 @@
 from maastesting.testcase import MAASTestCase
 from maastesting.utils import sample_binary_data
 from mock import Mock
-from provisioningserver import (
-    config,
-    upgrade_cluster,
-)
+from provisioningserver import upgrade_cluster
 from provisioningserver.boot.tftppath import list_subdirs
+from provisioningserver.testing.config import ClusterConfigurationFixture
 from provisioningserver.utils.fs import read_text_file
 from testtools.matchers import (
     DirExists,
@@ -88,7 +86,7 @@
 
     def configure_storage(self, storage_dir):
         """Create a storage config."""
-        self.patch(config, 'BOOT_RESOURCES_STORAGE', storage_dir)
+        self.useFixture(ClusterConfigurationFixture(tftp_root=storage_dir))
 
     def test__calls_chown_if_boot_resources_dir_exists(self):
         self.patch(upgrade_cluster, 'check_call')
@@ -102,7 +100,9 @@
     def test__skips_chown_if_boot_resources_dir_does_not_exist(self):
         self.patch(upgrade_cluster, 'check_call')
         storage_dir = os.path.join(self.make_dir(), factory.make_name('none'))
+        os.mkdir(storage_dir)
         self.configure_storage(storage_dir)
+        os.rmdir(storage_dir)
         upgrade_cluster.make_maas_own_boot_resources()
         self.assertThat(upgrade_cluster.check_call, MockNotCalled())
 
@@ -205,10 +205,11 @@
 
     def configure_storage(self, storage_dir, make_current_dir=True):
         """Create a storage config."""
-        if make_current_dir:
-            current_dir = os.path.join(storage_dir, "current")
-            os.mkdir(current_dir)
-        self.patch(config, 'BOOT_RESOURCES_STORAGE', storage_dir)
+        current_dir = os.path.join(storage_dir, "current")
+        os.makedirs(current_dir)
+        self.useFixture(ClusterConfigurationFixture(tftp_root=current_dir))
+        if not make_current_dir:
+            os.rmdir(current_dir)
 
     def test__list_subdirs_under_current_directory(self):
         self.patch(upgrade_cluster, 'list_subdirs').return_value = ['ubuntu']

=== modified file 'src/provisioningserver/upgrade_cluster.py'
--- src/provisioningserver/upgrade_cluster.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/upgrade_cluster.py	2015-07-03 11:18:28 +0000
@@ -38,12 +38,12 @@
 from subprocess import check_call
 from textwrap import dedent
 
-from provisioningserver import config
 from provisioningserver.auth import get_maas_user_gpghome
 from provisioningserver.boot.tftppath import (
     drill_down,
     list_subdirs,
 )
+from provisioningserver.config import ClusterConfiguration
 from provisioningserver.import_images.boot_resources import (
     update_targets_conf,
     write_targets_conf,
@@ -57,8 +57,10 @@
 def make_maas_own_boot_resources():
     """Upgrade hook: make the `maas` user the owner of the boot resources."""
     # This reduces the privileges required for importing and managing images.
-    if os.path.isdir(config.BOOT_RESOURCES_STORAGE):
-        check_call(['chown', '-R', 'maas', config.BOOT_RESOURCES_STORAGE])
+    with ClusterConfiguration.open() as config:
+        boot_resources_storage = config.tftp_root
+    if os.path.isdir(boot_resources_storage):
+        check_call(['chown', '-R', 'maas', boot_resources_storage])
 
 
 def create_gnupg_home():
@@ -145,10 +147,10 @@
 def filter_out_directories_with_extra_levels(paths):
     """Remove paths that contain directories with more levels. We don't want
     to move other operating systems under the ubuntu directory."""
+    with ClusterConfiguration.open() as config:
+        tftp_root = config.tftp_root
     for arch, subarch, release, label in paths:
-        path = os.path.join(
-            config.BOOT_RESOURCES_STORAGE, 'current',
-            arch, subarch, release, label)
+        path = os.path.join(tftp_root, arch, subarch, release, label)
         if len(list_subdirs(path)) == 0:
             yield (arch, subarch, release, label)
 
@@ -165,7 +167,8 @@
     folders have structure arch/subarch/release/label and move them into
     ubuntu folder. Making the final path ubuntu/arch/subarch/release/label.
     """
-    current_dir = os.path.join(config.BOOT_RESOURCES_STORAGE, "current")
+    with ClusterConfiguration.open() as config:
+        current_dir = config.tftp_root
     if not os.path.isdir(current_dir):
         return
     # If ubuntu folder already exists, then no reason to continue

=== modified file 'src/provisioningserver/utils/__init__.py'
--- src/provisioningserver/utils/__init__.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/utils/__init__.py	2015-07-03 11:18:28 +0000
@@ -18,7 +18,6 @@
     "commission_node",
     "filter_dict",
     "flatten",
-    "get_cluster_config",
     "import_settings",
     "locate_config",
     "parse_key_value_file",
@@ -116,7 +115,10 @@
     """
     # Avoid circular dependencies.
     from provisioningserver.rpc.region import CreateNode
-    from provisioningserver.cluster_config import get_cluster_uuid
+    from provisioningserver.config import ClusterConfiguration
+
+    with ClusterConfiguration.open() as config:
+        cluster_uuid = config.cluster_uuid
 
     if hostname is not None:
         hostname = coerce_to_valid_hostname(hostname)
@@ -138,7 +140,7 @@
     try:
         response = yield client(
             CreateNode,
-            cluster_uuid=get_cluster_uuid(),
+            cluster_uuid=cluster_uuid,
             architecture=arch,
             power_type=power_type,
             power_parameters=json.dumps(power_parameters),
@@ -216,24 +218,16 @@
 def locate_config(*path):
     """Return the location of a given config file or directory.
 
-    Defaults to `/etc/maas` (followed by any further path elements you
-    specify), but can be overridden using the `MAAS_CONFIG_DIR` environment
-    variable.  (When running from a branch, this variable will point to the
-    `etc/maas` inside the branch.)
-
-    The result is absolute and normalized.
+    :param path: Path elements to resolve relative to `${MAAS_ROOT}/etc/maas`.
     """
-    # Check for MAAS_CONFIG_DIR.  Count empty string as "not set."
-    env_setting = os.getenv('MAAS_CONFIG_DIR', '')
-    if env_setting == '':
-        # Running from installed package.  Config is in /etc/maas.
-        config_dir = '/etc/maas'
+    # The `os.curdir` avoids a crash when `path` is empty.
+    path = os.path.join(os.curdir, *path)
+    if os.path.isabs(path):
+        return path
     else:
-        # Running from branch or other customized setup.  Config is at
-        # $MAAS_CONFIG_DIR/etc/maas.
-        config_dir = env_setting
-
-    return os.path.abspath(os.path.join(config_dir, *path))
+        # Avoid circular imports.
+        from provisioningserver.path import get_tentative_path
+        return get_tentative_path("etc", "maas", path)
 
 
 setting_expression = r"""
@@ -245,15 +239,6 @@
     """
 
 
-def get_cluster_config(config_path):
-    contents = open(config_path).read()
-
-    results = re.findall(
-        setting_expression, contents, re.MULTILINE | re.VERBOSE)
-
-    return dict(results)
-
-
 def find_settings(whence):
     """Return settings from `whence`, which is assumed to be a module."""
     # XXX 2012-10-11 JeroenVermeulen, bug=1065456: Put this in a shared

=== modified file 'src/provisioningserver/utils/fs.py'
--- src/provisioningserver/utils/fs.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/utils/fs.py	2015-07-03 11:18:28 +0000
@@ -30,7 +30,6 @@
 from itertools import count
 import os
 from os import (
-    environ,
     rename,
     stat,
     chown,
@@ -58,7 +57,13 @@
     development mode it will return the path for the current development
     environment.
     """
-    return environ.get("MAAS_PROVISION_CMD", "maas-provision")
+    # Avoid circular imports.
+    from provisioningserver.config import is_dev_environment
+    if is_dev_environment():
+        from maastesting import root
+        return os.path.join(root, "bin", "maas-provision")
+    else:
+        return "maas-provision"
 
 
 def _write_temp_file(content, filename):

=== modified file 'src/provisioningserver/utils/script.py'
--- src/provisioningserver/utils/script.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/utils/script.py	2015-07-03 11:18:28 +0000
@@ -88,24 +88,7 @@
 
 
 class MainScript(ActionScript):
-    """An `ActionScript` that always accepts a `--config-file` option.
-
-    The `--config-file` option defaults to the value of
-    `MAAS_PROVISIONING_SETTINGS` in the process's environment, or absent
-    that, `$MAAS_CONFIG_DIR/pserv.yaml` (normally /etc/maas/pserv.yaml for
-    packaged installations, or when running from branch, the equivalent
-    inside that branch).
-    """
-
-    def __init__(self, description):
-        # Avoid circular imports.
-        from provisioningserver.config import Config
-
-        super(MainScript, self).__init__(description)
-        self.parser.add_argument(
-            "-c", "--config-file", metavar="FILENAME",
-            help="Configuration file to load [%(default)s].",
-            default=Config.DEFAULT_FILENAME)
+    """An `ActionScript` denoting the main script in an application."""
 
 
 class AtomicWriteScript:
@@ -141,7 +124,7 @@
         if args.mode is not None:
             mode = int(args.mode, 8)
         else:
-            mode = 0600
+            mode = 0o600
         atomic_write(
             content, args.filename, overwrite=not args.no_overwrite,
             mode=mode)

=== modified file 'src/provisioningserver/utils/tests/test_fs.py'
--- src/provisioningserver/utils/tests/test_fs.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/utils/tests/test_fs.py	2015-07-03 11:18:28 +0000
@@ -28,6 +28,7 @@
 import time
 
 from lockfile import FileLock
+from maastesting import root
 from maastesting.factory import factory
 from maastesting.fakemethod import FakeMethod
 from maastesting.matchers import MockCalledOnceWith
@@ -37,11 +38,13 @@
     Mock,
     sentinel,
 )
+import provisioningserver.config
 from provisioningserver.utils.fs import (
     atomic_symlink,
     atomic_write,
     ensure_dir,
     FileLockProxy,
+    get_maas_provision_command,
     get_mtime,
     incremental_write,
     pick_new_mtime,
@@ -284,6 +287,21 @@
         self.assertEqual(now, pick_new_mtime(now))
 
 
+class TestGetMAASProvisionCommand(MAASTestCase):
+
+    def test__returns_just_command_for_production(self):
+        self.patch(provisioningserver.config, "is_dev_environment")
+        provisioningserver.config.is_dev_environment.return_value = False
+        self.assertEqual("maas-provision", get_maas_provision_command())
+
+    def test__returns_full_path_for_development(self):
+        self.patch(provisioningserver.config, "is_dev_environment")
+        provisioningserver.config.is_dev_environment.return_value = True
+        self.assertEqual(
+            root.rstrip("/") + "/bin/maas-provision",
+            get_maas_provision_command())
+
+
 class TestSudoWriteFile(MAASTestCase):
     """Testing for `sudo_write_file`."""
 
@@ -301,11 +319,9 @@
 
         sudo_write_file(path, contents)
 
-        self.assertThat(fs_module.Popen, MockCalledOnceWith([
-            'sudo', '-n', 'maas-provision', 'atomic-write',
-            '--filename', path, '--mode', '0644',
-        ],
-            stdin=PIPE))
+        self.assertThat(fs_module.Popen, MockCalledOnceWith(
+            ['sudo', '-n', get_maas_provision_command(), 'atomic-write',
+             '--filename', path, '--mode', '0644'], stdin=PIPE))
 
     def test_encodes_contents(self):
         process = self.patch_popen()

=== modified file 'src/provisioningserver/utils/tests/test_script.py'
--- src/provisioningserver/utils/tests/test_script.py	2015-05-29 16:47:37 +0000
+++ src/provisioningserver/utils/tests/test_script.py	2015-07-03 11:18:28 +0000
@@ -38,7 +38,6 @@
 from provisioningserver.utils.script import (
     ActionScript,
     AtomicWriteScript,
-    MainScript,
 )
 from testtools.matchers import (
     FileContains,
@@ -158,30 +157,6 @@
         self.assertEqual(1, error.code)
 
 
-class TestMainScript(TestActionScript):
-