Merge lp:~blake-rouse/maas/fix-1387133-1.7 into lp:~maas-committers/maas/trunk

[Blake Rouse]

Handle wierd race that will delete a synced boot images. Add more logging to the importing of images on the region. Enable simplestreams to log to maas-django.log, without modifing the maas_local_settings.py file.

Backport: https://code.launchpad.net/~blake-rouse/maas/fix-1387133/+merge/240132

[Blake Rouse (blake-rouse)]

Self-approve.

Already approved for 1.7 landing here: https://code.launchpad.net/~blake-rouse/maas/fix-1387133/+merge/240132

review: Approve

[Andres Rodriguez (andreserl)]

This is a huge diff and I see merge conflcist. Can you check that this is
the correct branch?
On Oct 30, 2014 2:50 PM, "Blake Rouse" <email address hidden> wrote:

> Review: Approve
>
> Self-approve.
>
> Already approved for 1.7 landing here:
> https://code.launchpad.net/~blake-rouse/maas/fix-1387133/+merge/240132
> --
> https://code.launchpad.net/~blake-rouse/maas/fix-1387133-1.7/+merge/240153
> You are subscribed to branch lp:maas.
>

[Blake Rouse (blake-rouse)]

Yeah it was incorrect, I fixed the MP.

On Thu, Oct 30, 2014 at 3:42 PM, Andres Rodriguez <email address hidden>
wrote:

> This is a huge diff and I see merge conflcist. Can you check that this is
> the correct branch?
> On Oct 30, 2014 2:50 PM, "Blake Rouse" <email address hidden> wrote:
>
>> Review: Approve
>>
>> Self-approve.
>>
>> Already approved for 1.7 landing here:
>> https://code.launchpad.net/~blake-rouse/maas/fix-1387133/+merge/240132
>> --
>> https://code.launchpad.net/~blake-rouse/maas/fix-1387133-1.7/+merge/240153
>> You are subscribed to branch lp:maas.
>>
>

=== modified file 'INSTALL.txt'
--- INSTALL.txt	2014-10-24 05:53:08 +0000
+++ INSTALL.txt	2014-10-30 18:48:30 +0000
@@ -232,6 +232,7 @@
 Import the boot images
 ----------------------
 
+<<<<<<< TREE
 Since version 1.7, MAAS stores the boot images in the region controller's
 database, from where the cluster controllers will synchronise with the region
 and pull images from the region to the cluster's local disk.  This process
@@ -244,6 +245,18 @@
 To do it in the web user interface, go to the Images tab, check the boxes to
 say which images you want to import, and click the "Import images" button at
 the bottom of the Ubuntu section.
+=======
+MAAS will check for and download new Ubuntu images every hour.  On a new
+installation you'll need to start the import process manually once you have
+set up your MAAS region.
+
+There are two ways to start the import: through the web user interface, or
+through the remote API.
+
+To do it in the web user interface, go to the Images tab, check the boxes to
+say which images you want to import, and click the "Import images" button at
+the bottom of the Ubuntu section.
+>>>>>>> MERGE-SOURCE
 
 .. image:: media/import-images.*
 

=== modified file 'Makefile'
--- Makefile	2014-10-01 07:22:16 +0000
+++ Makefile	2014-10-30 18:48:30 +0000
@@ -351,8 +351,8 @@
 # has a bug and always considers apt-source tarballs before the specified
 # branch.  So instead, export to a local tarball which is always found.
 # Make sure debhelper and dh-apport packages are installed before using this.
-PACKAGING := $(CURDIR)/../packaging.trunk
-PACKAGING_BRANCH := lp:~maas-maintainers/maas/packaging
+PACKAGING := $(CURDIR)/../packaging.utopic
+PACKAGING_BRANCH := lp:~maas-maintainers/maas/packaging.utopic
 
 package_branch:
 	@echo Downloading/refreshing packaging branch...

=== modified file 'docs/changelog.rst'
--- docs/changelog.rst	2014-10-30 05:53:02 +0000
+++ docs/changelog.rst	2014-10-30 18:48:30 +0000
@@ -2,6 +2,7 @@
 Changelog
 =========
 
+<<<<<<< TREE
 1.7.0
 =====
 
@@ -403,6 +404,371 @@
 #1348364    non-maas managed subnets cannot query maas DNS
 #1381543    Disabling Disk Erasing with node in 'Failed Erasing' state leads to Invalid transition: Failed disk erasing -> Ready.
 
+=======
+1.7.0
+=====
+
+Major new features
+------------------
+
+Improved image downloading and reporting.
+  MAAS boot images are now downloaded centrally by the region controller
+  and disseminated to all registered cluster controllers.  This change includes
+  a new web UI under the `Images` tab that allows the admin to select
+  which images to import and shows the progress of the ongoing download.
+  This completely replaces any file-based configuration that used to take
+  place on cluster controllers.  The cluster page now shows whether it has
+  synchronised all the images from the region controller.
+
+  This process is also completely controllable using the API.
+
+Note:
+  Unfortunately due to a format change in the way images are stored, it
+  was not possible to migrate previously downloaded images to the new region
+  storage.  The cluster(s) will still be able to use the existing images,
+  however the region controller will be unaware of them until an import
+  is initiated.  When the import is finished, the cluster(s) will remove
+  older image resources.
+
+  This means that the first thing to do after upgrading to 1.7 is go to the
+  `Images` tab and re-import the images.
+
+Increased robustness.
+  A large amount of effort has been given to ensuring that MAAS remains
+  robust in the face of adversity.  An updated node state model has been
+  implemented that takes into account more of the situations in which a
+  node can be found including any failures at each stage.
+
+  When a node is getting deployed, it is now monitored to check that each
+  stage is reached in a timely fashion; if it does not then it is marked
+  as failed.
+
+  The core power driver was updated to check the state of the power on each
+  node and is reported in the web UI and API.  The core driver now also
+  handles retries when changing the power state of hardware, removing the
+  requirement that each power template handle it individually.
+
+RPC security.
+  As a step towards mutually verified TLS connections between MAAS's
+  components, 1.7 introduces a simple shared-secret mechanism to
+  authenticate the region with the clusters and vice-versa. For those
+  clusters that run on the same machine as the region controller (which
+  will account for most people), everything will continue to work
+  without intervention. However, if you're running a cluster on a
+  separate machine, you must install the secret:
+
+  1. After upgrading the region controller, view /var/lib/maas/secret
+     (it's text) and copy it.
+
+  2. On each cluster, run:
+
+       sudo -u maas maas-provision install-shared-secret
+
+     You'll be prompted for the secret; paste it in and press enter. It
+     is a password prompt, so the secret will not be echoed back to you.
+
+  That's it; the upgraded cluster controller will find the secret
+  without needing to be told.
+
+RPC connections.
+  Each cluster maintains a persistent connection to each region
+  controller process that's running. The ports on which the region is
+  listening are all high-numbered, and they are allocated randomly by
+  the OS. In a future release of MAAS we will narrow this down. For now,
+  each cluster controller needs unfiltered access to each machine in the
+  region on all high-numbered TCP ports.
+
+Node event log.
+  For every major event on nodes, it is now logged in a node-specific log.
+  This includes events such as power changes, deployments and any failures.
+
+IPv6.
+  It is now possible to deploy Ubuntu nodes that have IPv6 enabled.
+  See :doc:`ipv6` for more details.
+
+Removal of Celery and RabbitMQ.
+  While Celery was found to be very reliable it ultimately did not suit
+  the project's requirements as it is a largely fire-and-forget mechanism.
+  Additionally it was another moving part that caused some headaches for
+  users and admins alike, so the decision was taken to remove it and implement
+  a custom communications mechanism between the region controller and cluster
+  controllers.  The new mechanism is bidirectional and allowed the complex
+  interactions to take place that are required as part of the robustness
+  improvements.
+
+  Since a constant connection is maintained, as a side effect the web UI now
+  shows whether each cluster is connected or not.
+
+Support for other OSes.
+  Non-Ubuntu OSes are fully supported now. This includes:
+   - Windows
+   - Centos
+   - SuSE
+
+Custom Images.
+  MAAS now supports the deployment of Custom Images. Custom images can be
+  uploaded via the API. The usage of custom images allows the deployment of
+  other Ubuntu Flavors, such as Ubuntu Desktop.
+
+maas-proxy.
+  MAAS now uses maas-proxy as the default proxy solution instead of
+  squid-deb-proxy. On a fresh install, MAAS will use maas-proxy by default.
+  On upgrades from previous releases, MAAS will install maas-proxy instead of
+  squid-deb-proxy.
+
+Minor notable changes
+---------------------
+
+Better handling of networks.
+  All networks referred to by cluster interfaces are now automatically
+  registered on the Network page.  Any node network interfaces are
+  automatically linked to the relevant Network.
+
+Improved logging.
+  A total overhaul of where logging is produced was undertaken, and now
+  all the main events in MAAS are selectively reported to syslog with the
+  "maas" prefix from both the region and cluster controllers alike.  If MAAS
+  is installed using the standard Ubuntu packaging, its syslog entries are
+  redirected to /var/log/maas/maas.log.
+
+  On the clusters, pserv.log is now less chatty and contains only errors.
+  On the region controller appservers, maas-django.log contains only appserver
+  errors.
+
+Static IP selection.
+ The API was extended so that specific IPs can be pre-allocated for network
+ interfaces on nodes and for user-allocated IPs.
+
+Pronounceable random hostnames.
+ The old auto-generated 5-letter names were replaced with a pseudo-random
+ name that is produced from a dictionary giving names of the form
+ 'adjective-noun'.
+
+Bugs fixed in this release
+--------------------------
+#1081660    If maas-enlist fails to reach a DNS server, the node will be named ";; connection timed out; no servers could be reached"
+#1087183    MaaS cloud-init configuration specifies 'manage_etc_hosts: localhost'
+#1328351    ConstipationError: When the cluster runs the "import boot images" task it blocks other tasks
+#1340208    DoesNotExist: NodeGroupInterface has no nodegroup
+#1340896    MAAS upgrade from 1.5.2+bzr2282-0ubuntu0.2 to experiment failed
+#1342117    CLI command to set up node-group-interface fails with /usr/lib/python2.7/dist-packages/maascli/__main__.py: error: u'name'
+#1342395    power_on: ipmi failed: name 'power_off_mode' is not defined at line 12 column 18 in file /etc/maas/templates/power/ipmi.template
+#1347579    Schema migration 0091 is broken (node boot type)
+#1349254    Duplicate FQDN can be configured on MAAS via CLI or API
+#1352575    BMC password showing in the apache2 logs
+#1353598    maas-import-pxe-files logger import error for logger
+#1355014    Can't run tests without a net connection
+#1355534    UnknownPowerType traceback in appserver log
+#1356788    Test failure: “One or more services are registered” etc.
+#1359029    Power status monitoring does not scale
+#1359517    Periodic DHCP probe breaks: "Don't log exceptions to maaslog"
+#1359551    create_Network_from_NodeGroupInterface is missing a catch for IntegrityError
+#1360004    UI becomes unresponsive (unaccessible) if RPC to cluster fails
+#1360008    Data migration fails with django.db.utils.InternalError: current transaction is aborted, commands ignored until end of transaction block
+#1360676    KeyError raised importing boot images
+#1361799    absolute_reverse returns incorrect url if base_url is missing ending /
+#1362397    django.core.exceptions.ValidationError: {'power_state': [u'Ensure this value has at most 10 characters (it has 18).']}
+#1363105    Change in absolute_reverse breaks netbooting on installed MAAS
+#1363116    DHCP Probe timer service fails
+#1363138    DHCP Probe TimerService fails with 'NoneType' object has no attribute 'encode'
+#1363474    exceptions.KeyError: u'subarches' when syncing uploaded image from region to cluster
+#1363525    preseed path for generated tgz doesn't match actual path
+#1363722    Boot resource upload failed: error: length too large
+#1363850    Auto-enlistment not reporting power parameters
+#1363900    Dev server errors while trying to write to '/var/lib/maas'
+#1363999    Not assigning static IP addresses
+#1364062    New download boot resources method doesn't use the configured proxy
+#1364481    http 500 error doesn't contain a stack trace
+#1364993    500 error when trying to acquire a commissioned node (AddrFormatError: failed to detect a valid IP address from None)
+#1365130    django-admin prints spurious messages to stdout, breaking scripts
+#1365175    bootloader import code goes directly to archive.ubuntu.com rather than the configured archive
+#1365850    DHCP scan using cluster interface name as network interface?
+#1366104    [FFe] OperationError when large object greater than 2gb
+#1366172    NUC does not boot after power off/power on
+#1366212    Large dhcp leases file leads to tftp timeouts
+#1366652    Leaking temporary directories
+#1366726    CI breakage: Deployed nodes don't get a static IP address
+#1368269    internal server error when deleting a node
+#1368590    Power actions are not serialized.
+#1370534    Recurrent update of the power state of nodes crashes if the connection to the BMC fails.
+#1370958    excessive pserv logging
+#1371033    A node can get stuck in the 'RELEASING' state if the power change command fails to power down the node.
+#1371064    Spurious test failure: maasserver.rpc.tests.test_nodes.TestCreateNode.test_creates_node
+#1371236    power parameters for probe-and-enlist mscm no longer saved for enlisted nodes
+#1372408    PowerQuery RPC method crashes with exceptions.TypeError: get_power_state() got an unexpected keyword argument 'power_change'
+#1372732    ImportError running src/metadataserver/tests/test_fields.py
+#1372735    Deprecation warning breaks Node model tests
+#1372767    Twisted web client does not support IPv6 address
+#1372944    Twisted web client fails looking up IPv6 address hostname
+#1373031    Cannot register cluster
+#1373103    compose_curtin_network_preseed breaks installation of all other operating systems
+#1373207    Can't build package
+#1373237    maas-cluster-controller installation breaks: __main__.py: error: unrecognized arguments: -u maas -g maas
+#1373265    Where did the “Import boot images” button go?
+#1373357    register_event_type fails: already exists
+#1373368    Conflicting power actions being dropped on the floor can result in leaving a node in an inconsistent state
+#1373477    Circular import between preseed.py and models/node.py
+#1373658    request_node_info_by_mac_address errors during enlistment: MACAddress matching query does not exist
+#1373699    Cluster Listing Page lacks feedback about the images each cluster has
+#1373710    Machines fail to PXE Boot
+#1374102    No retries for AMT power?
+#1374388    UI checkbox for Node.disable_ipv4 never unchecks
+#1374793    Cluster page no longer shows whether the cluster is connected or not.
+#1375594    After a fresh install, cluster can't connect to region
+#1375664    Node powering on but not deploying
+#1375835    Can't create node in the UI with 1.7 beta 4
+#1375970    Timeout leads to inconsistency between maas and real world state, can't commission or start nodes
+#1375980    Nodes failed to transition out of "New" state on bulk commission
+#1376000    oops: 'NoneType' object has no attribute 'encode'
+#1376023    After performing bulk action on maas nodes, Internal Server Error
+#1376028    maasserver Unable to identify boot image for (ubuntu/amd64/generic/trusty/poweroff): cluster 'maas' does not have matching boot image.
+#1376031    WebUI became unresponsive after disconnecting Remote Cluster Controller (powered node off)
+#1376303    Can't commission a node: xceptions.AttributeError: 'NoneType' object has no attribute 'addCallback'
+#1376304    Timeout errors in RPC commands cause 500 errors
+#1376782    Node stuck with: "another action is already in progress for that node."
+#1376888    Nodes can't be deleted if DHCP management is off.
+#1377099    Bulk operation leaves nodes in inconsistent state
+#1377860    Nodes not configured with IPv6 DNS server address
+#1379154    "boot-images" link in the "Visit the boot images page to start the import." is a 404
+#1379209    When a node has multiple interfaces on a network MAAS manages, MAAS assigns static IP addresses to all of them
+#1379568    maas-cluster fails to register if the host has an IPv6 address
+#1379591    nodes with two interfaces fail to deploy in maas 1.7 beta5
+#1379641    IPv6 netmasks aren't *always* 64 bits, but we only configure 64-bit ones
+#1379649    Invalid transition - 'Releasing Failed' to 'Disk Erasing'
+#1379744    Cluster registration is fragile and insecure
+#1379924    maas 1.7 flooded with OOPSs
+#1380927    Default Cluster does not autoconnect after a fresh install
+#1380932    MAAS does not cope with changes of the dhcp daemons
+#1381605    Not all the DNS records are being added when deploying multiple nodes
+#1381714    Nodes release API bypasses disk erase
+#1012954    If a power script fails, there is no UI feedback
+#1057250    TestGetLongpollContext.test_get_longpoll_context is causing test failures in metadataserver
+#1186196    "Starting a node" has different meanings in the UI and in the API.
+#1237215    maas and curtin do not indicate failure reasonably
+#1273222    MAAS doesn't check return values of power actions
+#1288502    archive and proxy settings not honoured for commissioning
+#1300554    If the rabbit password changes, clusters are not informed
+#1315161    cannot deploy Windows
+#1316919    Checks don't exist to confirm a node will actually boot
+#1321885    IPMI detection and automatic setting fail in ubuntu 14.04 maas
+#1325610    node marked "Ready" before poweroff complete
+#1325638    Add hardware enablement for Universal Management Gateway
+#1333954    global registry of license keys
+#1334963    Nodegroupinterface.clean_ip_ranges() is very slow with large networks
+#1337437    [SRU] maas needs utopic support
+#1338169    Non-Ubuntu preseed templates are not tested
+#1339868    No way to list supported operating systems via RPC
+#1339903    No way to validate an OS license key via RPC
+#1340188    unallocated node started manually, causes AssertionError for purpose poweroff
+#1340305    No way to get the title for a release from OperatingSystem
+#1341118    No feedback when IPMI credentials fail
+#1341121    No feedback to user when cluster is not running
+#1341581    power state is not represented in api and ui
+#1341619    NodeGroupInterface is not linked to Network
+#1341772    No way to get extra preseed data from OperatingSystem via RPC
+#1341800    MAAS doesn't support soft power off through the API
+#1343425    deprecate use-fastpath-installer tag and use a property on node instead
+#1344177    hostnames can't be changed while a node is acquired
+#1347518    Confusing error message when API key is wrong
+#1349496    Unable to request a specific static IP on the API
+#1349736    MAAS logging is too verbose and not very useful
+#1349917    guess_server_address() can return IPAddress or hostname
+#1350103    No support for armhf/keystone architecture
+#1350856    Can't constrain acquisition of nodes by not having a tag
+#1350948    IPMI power template treats soft as an option rather than a command
+#1354014    clusters should sync boot images from the region
+#1356490    Metadataserver api needs tests for _store_installing_results
+#1356780    maaslog items are logged twice
+#1356880    MAAS shouldn't allow changing the hostname of a deployed node
+#1357071    When a power template fails, the content of the event from the node event log is not readable (it contains the whole template)
+#1357685    docs/bootsources.rst:: WARNING: document isn't included in any toctree
+#1357714    Virsh power driver does not seem to work at all
+#1358177    maas-region-admin requires root privileges [docs]
+#1358337    [docs] MAAS documentation suggests to execute 'juju --sync-tools'
+#1358829    IPMI power query fails when trying to commit config changes
+#1358859    Commissioning output xml is hard to understand, would be nice to have yaml as an output option.
+#1359169    MAAS should handle invalid consumers gracefully
+#1359822    Gateway is missing in network definition
+#1361897    exceptions in PeriodicImageDownloadService will cause it to stop running
+#1361941    erlang upgrade makes maas angry
+#1361967    NodePowerMonitorService has no tests
+#1363913    Impossible to remove last MAC from network in UI
+#1364228    Help text for node hostname is wrong
+#1364591    MAAS Archive Mirror does not respect non-default port
+#1364617    ipmipower returns a zero exit status when password invalid
+#1364713    selenium test will not pass with new Firefox
+#1365616    Non-admin access to cluster controller config
+#1365619    DNS should be an optional field in the network definition
+#1365722    NodeStateViolation when commissioning
+#1365742    Logged OOPS ... NoSuchEventType: Event type with name=NODE_POWER_ON_FAILED could not be found.
+#1365776    commissioning results view for a node also shows installation results
+#1366812    Old boot resources are not being removed on clusters
+#1367455    MAC address for node's IPMI is reversed looked up to yield IP address using case sensitive comparison
+#1368398    Can't mark systems that 'Failed commissioning' as 'Broken'
+#1368916    No resources found in Simplestreams repository
+#1370860    Node power monitor doesn't cope with power template answers other than "on" or "off"
+#1370887    No event is registered on a node for when the power monitor sees a problem
+#1371663    Node page Javascript crashes when there is no lshw output to display yet
+#1371763    Need to use RPC for validating license key.
+#1372974    No "installation complete" event
+#1373272    "No boot images are available.…" message doesn't disappear when images are imported
+#1373580    [SRU] Glen m700 cartridge list as ARM64/generic after enlist
+#1373723    Releasing a node without power parameters ends up in not being able to release a node
+#1373727    PXE node event logs provide too much info
+#1373900    New install of MAAS can't download boot images
+#1374153    Stuck in "power controller problem"
+#1374321    Internal server error when attempting to perform an action when the cluster is down
+#1375360    Automatic population of managed networks for eth1 and beyond
+#1375427    Need to remove references to older import images button
+#1375647    'static-ipaddresses' capability in 1.6 not documented.
+#1375681    "Importing images . . .​" message on the image page never disappears
+#1375953    bootsourcecache is not refreshed when sources change
+#1376016    MAAS lacks a setting for the Simple Streams Image repository location
+#1376481    Wrong error messages in UI
+#1376620    maas-url config question doesn't make clear that localhost won't do
+#1376990    Elusive JavaScript lint
+#1378366    When there are no images, clusters should show that there
+#1378527    Images UI doesn't handle HWE images
+#1378643    Periodic test failure for compose_curtin_network_preseed_for
+#1378837    "Abort operation" action name is vague and misleading
+#1378910    Call the install log 'install log' rather than 'curtin log'
+#1379401    Race in EventManager.register_event_and_event_type
+#1379816    disable_ipv4 has a default setting on the cluster, but it's not visible
+#1380470    Event log says node was allocated but doesn't say to *whom*
+#1380805    uprade from 1.5.4 to 1.7 overwrote my cluster name
+#1381007    "Acquire and start node" button appears on node page for admins who don't own an allocated but unstarted node
+#1381213    mark_fixed should clear the osystem and distro_series fields
+#1381747    APIRPCErrorsMiddleware isn't installed
+#1381796    license_key is not given in the curtin_userdata preseed for Windows
+#1172773    Web UI has no indication of image download status.
+#1233158    no way to get power parameters in api
+#1319854    `maas login` tells you you're logged in successfully when you're not
+#1351451    Impossible to release a BROKEN node via the API.
+#1361040    Weird log message: "Power state has changed from unknown to connection timeout."
+#1366170    Node Event log doesn't currently display anything apart from power on/off
+#1368480    Need API to gather image metadata across all of MAAS
+#1370306    commissioning output XML and YAML tabs are not vertical
+#1371122    WindowsBootMethod request pxeconfig from API for every file
+#1376030    Unable to get RPC connection for cluster 'maas' <-- 'maas' is the DNS zone name
+#1378358    Missing images warning should contain a link to images page
+#1281406    Disk/memory space on Node edit page have no units
+#1299231    MAAS DHCP/DNS can't manage more than a /16 network
+#1357381    maas-region-admin createadmin shows error if not params given
+#1357686    Caching in get_worker_user() looks like premature optimisation
+#1358852    Tons of Linking <mac address> to <cluster interface> spam in log
+#1359178    Docs - U1 still listed for uploading data
+#1359947    Spelling Errors/Inconsistencies with MAAS Documentation
+#1365396    UI: top link to “<name> MAAS” only appears on some pages
+#1365591    "Start node" UI button does not allocate node before starting in 1.7
+#1365603    No "stop node" button on the page of a node with status "failed deployment"
+#1371658    Wasted space in the "Discovery data" section of the node page
+#1376393    powerkvm boot loader installs even when not needed
+#1376956    commissioning results page with YAML/XML output tabs are not centered on page.
+#1287224    MAAS random generated hostnames are not pronounceable
+#1348364    non-maas managed subnets cannot query maas DNS
+#1381543    Disabling Disk Erasing with node in 'Failed Erasing' state leads to Invalid transition: Failed disk erasing -> Ready.
+
+>>>>>>> MERGE-SOURCE
 1.6.1
 =====
 

=== modified file 'docs/index.rst'
=== modified file 'src/maasserver/api/nodes.py'
=== modified file 'src/maasserver/forms.py'
=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2014-09-25 21:06:39 +0000
+++ src/maasserver/forms_settings.py	2014-10-30 18:48:30 +0000
@@ -266,6 +266,16 @@
                 "Erase nodes' disks prior to releasing.")
         }
     },
+    'enable_dhcp_discovery_on_unconfigured_interfaces': {
+        'default': False,
+        'form': forms.BooleanField,
+        'form_kwargs': {
+            'required': False,
+            'label': (
+                "Perform DHCP discovery on unconfigured network "
+                "interfaces of commissioning nodes."),
+        }
+    },
 }
 
 

=== modified file 'src/maasserver/middleware.py'
=== modified file 'src/maasserver/models/config.py'
--- src/maasserver/models/config.py	2014-10-08 20:41:31 +0000
+++ src/maasserver/models/config.py	2014-10-30 18:48:30 +0000
@@ -60,6 +60,7 @@
         # Third Party
         'enable_third_party_drivers': True,
         'enable_disk_erasing_on_release': False,
+        'enable_dhcp_discovery_on_unconfigured_interfaces': True,
         ## /settings
         }
 

=== modified file 'src/maasserver/models/node.py'
--- src/maasserver/models/node.py	2014-10-30 00:39:21 +0000
+++ src/maasserver/models/node.py	2014-10-30 18:48:30 +0000
@@ -327,6 +327,146 @@
         available_nodes = self.get_nodes(for_user, NODE_PERMISSION.VIEW)
         return available_nodes.filter(status=NODE_STATUS.READY)
 
+<<<<<<< TREE
+=======
+    def stop_nodes(self, ids, by_user, stop_mode='hard'):
+        """Request on given user's behalf that the given nodes be shut down.
+
+        Shutdown is only requested for nodes that the user has ownership
+        privileges for; any other nodes in the request are ignored.
+
+        :param ids: The `system_id` values for nodes to be shut down.
+        :type ids: Sequence
+        :param by_user: Requesting user.
+        :type by_user: User_
+        :param stop_mode: Power off mode - usually 'soft' or 'hard'.
+        :type stop_mode: unicode
+        :return: Those Nodes for which shutdown was actually requested.
+        :rtype: list
+        """
+        # Obtain node model objects for each node specified.
+        nodes = self.get_nodes(by_user, NODE_PERMISSION.EDIT, ids=ids)
+
+        # Helper function to whittle the list of nodes down to those that we
+        # can actually stop, and keep hold of their power control info.
+        def gen_power_info(nodes):
+            for node in nodes:
+                power_info = node.get_effective_power_info()
+                if power_info.can_be_stopped:
+                    # Smuggle in a hint about how to power-off the node.
+                    power_info.power_parameters['power_off_mode'] = stop_mode
+                    yield node, power_info
+
+        # Create info that we can pass into the reactor (no model objects).
+        nodes_stop_info = list(
+            (node.system_id, node.hostname, node.nodegroup.uuid, power_info)
+            for node, power_info in gen_power_info(nodes))
+        powered_systems = [
+            system_id for system_id, _, _, _ in nodes_stop_info]
+
+        # Request that these nodes be powered off and wait for the
+        # commands to return or fail.
+        deferreds = power_off_nodes(nodes_stop_info).viewvalues()
+        wait_for_power_commands(deferreds)
+
+        # Return a list of those nodes that we've sent power commands for.
+        return list(
+            node for node in nodes if node.system_id in powered_systems)
+
+    def start_nodes(self, ids, by_user, user_data=None):
+        """Request on given user's behalf that the given nodes be started up.
+
+        Power-on is only requested for nodes that the user has ownership
+        privileges for; any other nodes in the request are ignored.
+
+        Nodes are also ignored if they don't have a valid power type
+        configured.
+
+        :param ids: The `system_id` values for nodes to be started.
+        :type ids: Sequence
+        :param by_user: Requesting user.
+        :type by_user: User_
+        :param user_data: Optional blob of user-data to be made available to
+            the nodes through the metadata service.  If not given, any
+            previous user data is used.
+        :type user_data: unicode
+        :return: Those Nodes for which power-on was actually requested.
+        :rtype: list
+
+        :raises MultipleFailures: When there are failures originating from a
+            remote process. There could be one or more failures -- it's not
+            strictly *multiple* -- but they do all originate from comms with
+            remote processes.
+        :raises: `StaticIPAddressExhaustion` if there are not enough IP
+            addresses left in the static range..
+        """
+        # Avoid circular imports.
+        from metadataserver.models import NodeUserData
+
+        # Obtain node model objects for each node specified.
+        nodes = self.get_nodes(by_user, NODE_PERMISSION.EDIT, ids=ids)
+
+        # Record the same user data for all nodes we've been *requested* to
+        # start, regardless of whether or not we actually can; the user may
+        # choose to manually start them.
+        NodeUserData.objects.bulk_set_user_data(nodes, user_data)
+
+        # Claim static IP addresses for all nodes we've been *requested* to
+        # start, such that they're recorded in the database. This results in a
+        # mapping of nodegroups to (ips, macs).
+        static_mappings = defaultdict(dict)
+        for node in nodes:
+            if node.status == NODE_STATUS.ALLOCATED:
+                claims = node.claim_static_ip_addresses()
+                # If the PXE mac is on a managed interface then we can ask
+                # the cluster to generate the DHCP host map(s).
+                if node.is_pxe_mac_on_managed_interface():
+                    static_mappings[node.nodegroup].update(claims)
+                node.start_deployment()
+
+        # XXX 2014-06-17 bigjools bug=1330765
+        # If the above fails it needs to release the static IPs back to the
+        # pool. An enclosing transaction or savepoint from the caller may take
+        # care of this, given that a serious problem above will result in an
+        # exception. If we're being belt-n-braces though it ought to clear up
+        # before returning too. As part of the robustness work coming up, it
+        # also needs to inform the user.
+
+        # Update host maps and wait for them so that we can report failures
+        # directly to the caller.
+        update_host_maps_failures = list(update_host_maps(static_mappings))
+        if len(update_host_maps_failures) != 0:
+            raise MultipleFailures(*update_host_maps_failures)
+
+        # Update the DNS zone with the new static IP info as necessary.
+        from maasserver.dns.config import change_dns_zones
+        change_dns_zones({node.nodegroup for node in nodes})
+
+        # Helper function to whittle the list of nodes down to those that we
+        # can actually start, and keep hold of their power control info.
+        def gen_power_info(nodes):
+            for node in nodes:
+                power_info = node.get_effective_power_info()
+                if power_info.can_be_started:
+                    yield node, power_info
+
+        # Create info that we can pass into the reactor (no model objects).
+        nodes_start_info = list(
+            (node.system_id, node.hostname, node.nodegroup.uuid, power_info)
+            for node, power_info in gen_power_info(nodes))
+        powered_systems = [
+            system_id for system_id, _, _, _ in nodes_start_info]
+
+        # Request that these nodes be powered off and wait for the
+        # commands to return or fail.
+        deferreds = power_on_nodes(nodes_start_info).viewvalues()
+        wait_for_power_commands(deferreds)
+
+        # Return a list of those nodes that we've sent power commands for.
+        return list(
+            node for node in nodes if node.system_id in powered_systems)
+
+>>>>>>> MERGE-SOURCE
 
 def patch_pgarray_types():
     """Monkey-patch incompatibility with recent versions of `djorm_pgarray`.
@@ -1238,6 +1378,7 @@
         self.distro_series = ''
         self.license_key = ''
         self.save()
+<<<<<<< TREE
 
         # Clear installation results
         NodeResult.objects.filter(
@@ -1250,6 +1391,16 @@
         from maasserver.dns.config import change_dns_zones
         change_dns_zones([self.nodegroup])
 
+=======
+
+        # Do these after updating the node to avoid creating deadlocks with
+        # other node editing operations.
+        deallocated_ips = StaticIPAddress.objects.deallocate_by_node(self)
+        self.delete_host_maps(deallocated_ips)
+        from maasserver.dns.config import change_dns_zones
+        change_dns_zones([self.nodegroup])
+
+>>>>>>> MERGE-SOURCE
         # We explicitly commit here because during bulk node actions we
         # want to make sure that each successful state transition is
         # recorded in the DB.
@@ -1426,6 +1577,7 @@
             return self.pxe_mac
 
         return self.macaddress_set.first()
+<<<<<<< TREE
 
     def is_pxe_mac_on_managed_interface(self):
         pxe_mac = self.get_pxe_mac()
@@ -1553,3 +1705,13 @@
         deferreds = power_off_nodes([stop_info]).viewvalues()
         wait_for_power_commands(deferreds)
         return True
+=======
+
+    def is_pxe_mac_on_managed_interface(self):
+        pxe_mac = self.get_pxe_mac()
+        if pxe_mac is not None:
+            cluster_interface = pxe_mac.cluster_interface
+            if cluster_interface is not None:
+                return cluster_interface.is_managed
+        return False
+>>>>>>> MERGE-SOURCE

=== modified file 'src/maasserver/models/tests/test_bootsource.py'
--- src/maasserver/models/tests/test_bootsource.py	2014-09-30 19:48:33 +0000
+++ src/maasserver/models/tests/test_bootsource.py	2014-10-30 18:48:30 +0000
@@ -15,6 +15,7 @@
 __all__ = []
 
 import os
+from unittest import skip
 
 from django.core.exceptions import ValidationError
 from maasserver.bootsources import _cache_boot_sources
@@ -98,6 +99,9 @@
             [],
             boot_source_dict['selections'])
 
+    # XXX: GavinPanella 2014-10-28 bug=1376317: This test is fragile, possibly
+    # due to isolation issues.
+    @skip("Possible isolation issues")
     def test_calls_cache_boot_sources_on_create(self):
         mock_callLater = self.patch(reactor, 'callLater')
         BootSource.objects.create(

=== modified file 'src/maasserver/models/tests/test_node.py'
--- src/maasserver/models/tests/test_node.py	2014-10-30 00:39:21 +0000
+++ src/maasserver/models/tests/test_node.py	2014-10-30 18:48:30 +0000
@@ -19,6 +19,7 @@
     timedelta,
     )
 import random
+from unittest import skip
 
 import crochet
 from django.core.exceptions import ValidationError
@@ -2057,6 +2058,422 @@
         self.assertThat(erase_mock, MockNotCalled())
 
 
+<<<<<<< TREE
+=======
+class NodeManagerTest_StartNodes(MAASServerTestCase):
+
+    def setUp(self):
+        super(NodeManagerTest_StartNodes, self).setUp()
+        self.useFixture(RegionEventLoopFixture("rpc"))
+        self.useFixture(RunningEventLoopFixture())
+        self.rpc_fixture = self.useFixture(MockLiveRegionToClusterRPCFixture())
+
+    def prepare_rpc_to_cluster(self, nodegroup):
+        protocol = self.rpc_fixture.makeCluster(
+            nodegroup, cluster_module.CreateHostMaps, cluster_module.PowerOn,
+            cluster_module.StartMonitors)
+        protocol.CreateHostMaps.side_effect = always_succeed_with({})
+        protocol.StartMonitors.side_effect = always_succeed_with({})
+        protocol.PowerOn.side_effect = always_succeed_with({})
+        return protocol
+
+    def make_acquired_nodes_with_macs(self, user, nodegroup=None, count=3):
+        nodes = []
+        for _ in xrange(count):
+            node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+                nodegroup=nodegroup, status=NODE_STATUS.READY)
+            self.prepare_rpc_to_cluster(node.nodegroup)
+            node.acquire(user)
+            nodes.append(node)
+        return nodes
+
+    def test__sets_user_data(self):
+        user = factory.make_User()
+        nodegroup = factory.make_NodeGroup()
+        self.prepare_rpc_to_cluster(nodegroup)
+        nodes = self.make_acquired_nodes_with_macs(user, nodegroup)
+        user_data = factory.make_bytes()
+
+        with TwistedLoggerFixture() as twisted_log:
+            Node.objects.start_nodes(
+                list(node.system_id for node in nodes),
+                user, user_data=user_data)
+
+        # All three nodes have been given the same user data.
+        nuds = NodeUserData.objects.filter(
+            node_id__in=(node.id for node in nodes))
+        self.assertEqual({user_data}, {nud.data for nud in nuds})
+        # No complaints are made to the Twisted log.
+        self.assertFalse(twisted_log.containsError(), twisted_log.output)
+
+    def test__resets_user_data(self):
+        user = factory.make_User()
+        nodegroup = factory.make_NodeGroup()
+        self.prepare_rpc_to_cluster(nodegroup)
+        nodes = self.make_acquired_nodes_with_macs(user, nodegroup)
+
+        with TwistedLoggerFixture() as twisted_log:
+            Node.objects.start_nodes(
+                list(node.system_id for node in nodes),
+                user, user_data=None)
+
+        # All three nodes have been given the same user data.
+        nuds = NodeUserData.objects.filter(
+            node_id__in=(node.id for node in nodes))
+        self.assertThat(list(nuds), HasLength(0))
+        # No complaints are made to the Twisted log.
+        self.assertFalse(twisted_log.containsError(), twisted_log.output)
+
+    def test__claims_static_ip_addresses(self):
+        user = factory.make_User()
+        nodegroup = factory.make_NodeGroup()
+        self.prepare_rpc_to_cluster(nodegroup)
+        nodes = self.make_acquired_nodes_with_macs(user, nodegroup)
+
+        claim_static_ip_addresses = self.patch_autospec(
+            Node, "claim_static_ip_addresses", spec_set=False)
+        claim_static_ip_addresses.return_value = {}
+
+        with TwistedLoggerFixture() as twisted_log:
+            Node.objects.start_nodes(
+                list(node.system_id for node in nodes), user)
+
+        for node in nodes:
+            self.expectThat(claim_static_ip_addresses, MockAnyCall(node))
+        # No complaints are made to the Twisted log.
+        self.assertFalse(twisted_log.containsError(), twisted_log.output)
+
+    def test__claims_static_ip_addresses_for_allocated_nodes_only(self):
+        user = factory.make_User()
+        nodegroup = factory.make_NodeGroup()
+        self.prepare_rpc_to_cluster(nodegroup)
+        nodes = self.make_acquired_nodes_with_macs(user, nodegroup, count=2)
+
+        # Change the status of the first node to something other than
+        # allocated.
+        broken_node, allocated_node = nodes
+        broken_node.status = NODE_STATUS.BROKEN
+        broken_node.save()
+
+        claim_static_ip_addresses = self.patch_autospec(
+            Node, "claim_static_ip_addresses", spec_set=False)
+        claim_static_ip_addresses.return_value = {}
+
+        with TwistedLoggerFixture() as twisted_log:
+            Node.objects.start_nodes(
+                list(node.system_id for node in nodes), user)
+
+        # Only one call is made to claim_static_ip_addresses(), for the
+        # still-allocated node.
+        self.assertThat(
+            claim_static_ip_addresses,
+            MockCalledOnceWith(allocated_node))
+        # No complaints are made to the Twisted log.
+        self.assertFalse(twisted_log.containsError(), twisted_log.output)
+
+    def test__updates_host_maps(self):
+        user = factory.make_User()
+        nodes = self.make_acquired_nodes_with_macs(user)
+
+        update_host_maps = self.patch(node_module, "update_host_maps")
+        update_host_maps.return_value = []  # No failures.
+
+        with TwistedLoggerFixture() as twisted_log:
+            Node.objects.start_nodes(
+                list(node.system_id for node in nodes), user)
+
+        # Host maps are updated.
+        self.assertThat(
+            update_host_maps, MockCalledOnceWith({
+                node.nodegroup: {
+                    ip_address.ip: mac.mac_address
+                    for ip_address in mac.ip_addresses.all()
+                }
+                for node in nodes
+                for mac in node.mac_addresses_on_managed_interfaces()
+            }))
+        # No complaints are made to the Twisted log.
+        self.assertFalse(twisted_log.containsError(), twisted_log.output)
+
+    def test__propagates_errors_when_updating_host_maps(self):
+        user = factory.make_User()
+        nodes = self.make_acquired_nodes_with_macs(user)
+
+        update_host_maps = self.patch(node_module, "update_host_maps")
+        update_host_maps.return_value = [
+            Failure(AssertionError("That is so not true")),
+            Failure(ZeroDivisionError("I cannot defy mathematics")),
+        ]
+
+        with TwistedLoggerFixture() as twisted_log:
+            error = self.assertRaises(
+                MultipleFailures, Node.objects.start_nodes,
+                list(node.system_id for node in nodes), user)
+
+        self.assertSequenceEqual(
+            update_host_maps.return_value, error.args)
+
+        # No complaints are made to the Twisted log.
+        self.assertFalse(twisted_log.containsError(), twisted_log.output)
+
+    def test__updates_dns(self):
+        user = factory.make_User()
+        nodes = self.make_acquired_nodes_with_macs(user)
+
+        change_dns_zones = self.patch(dns_config, "change_dns_zones")
+
+        with TwistedLoggerFixture() as twisted_log:
+            Node.objects.start_nodes(
+                list(node.system_id for node in nodes), user)
+
+        self.assertThat(
+            change_dns_zones, MockCalledOnceWith(
+                {node.nodegroup for node in nodes}))
+
+        # No complaints are made to the Twisted log.
+        self.assertFalse(twisted_log.containsError(), twisted_log.output)
+
+    def test__starts_nodes(self):
+        user = factory.make_User()
+        nodes = self.make_acquired_nodes_with_macs(user)
+        power_infos = list(
+            node.get_effective_power_info()
+            for node in nodes)
+
+        power_on_nodes = self.patch(node_module, "power_on_nodes")
+        power_on_nodes.return_value = {}
+
+        with TwistedLoggerFixture() as twisted_log:
+            Node.objects.start_nodes(
+                list(node.system_id for node in nodes), user)
+
+        self.assertThat(power_on_nodes, MockCalledOnceWith(ANY))
+
+        nodes_start_info_observed = power_on_nodes.call_args[0][0]
+        nodes_start_info_expected = [
+            (node.system_id, node.hostname, node.nodegroup.uuid, power_info)
+            for node, power_info in izip(nodes, power_infos)
+        ]
+
+        # If the following fails the diff is big, but it's useful.
+        self.maxDiff = None
+
+        self.assertItemsEqual(
+            nodes_start_info_expected,
+            nodes_start_info_observed)
+
+        # No complaints are made to the Twisted log.
+        self.assertFalse(twisted_log.containsError(), twisted_log.output)
+
+    def test__raises_failures_for_nodes_that_cannot_be_started(self):
+        power_on_nodes = self.patch(node_module, "power_on_nodes")
+        power_on_nodes.return_value = {
+            factory.make_name("system_id"): defer.fail(
+                ZeroDivisionError("Defiance is futile")),
+            factory.make_name("system_id"): defer.succeed({}),
+        }
+
+        failures = self.assertRaises(
+            MultipleFailures, Node.objects.start_nodes, [],
+            factory.make_User())
+        [failure] = failures.args
+        self.assertThat(failure.value, IsInstance(ZeroDivisionError))
+
+    def test__marks_allocated_node_as_deploying(self):
+        user = factory.make_User()
+        [node] = self.make_acquired_nodes_with_macs(user, count=1)
+        nodes_started = Node.objects.start_nodes([node.system_id], user)
+        self.assertItemsEqual([node], nodes_started)
+        self.assertEqual(
+            NODE_STATUS.DEPLOYING, reload_object(node).status)
+
+    def test__does_not_change_state_of_deployed_node(self):
+        user = factory.make_User()
+        node = factory.make_Node(
+            power_type='ether_wake', status=NODE_STATUS.DEPLOYED,
+            owner=user)
+        factory.make_MACAddress(node=node)
+        power_on_nodes = self.patch(node_module, "power_on_nodes")
+        power_on_nodes.return_value = {
+            node.system_id: defer.succeed({}),
+        }
+        nodes_started = Node.objects.start_nodes([node.system_id], user)
+        self.assertItemsEqual([node], nodes_started)
+        self.assertEqual(
+            NODE_STATUS.DEPLOYED, reload_object(node).status)
+
+    def test__only_returns_nodes_for_which_power_commands_have_been_sent(self):
+        user = factory.make_User()
+        node1, node2 = self.make_acquired_nodes_with_macs(user, count=2)
+        node1.power_type = 'ether_wake'  # Can be started.
+        node1.save()
+        node2.power_type = ''  # Undefined power type, cannot be started.
+        node2.save()
+        nodes_started = Node.objects.start_nodes(
+            [node1.system_id, node2.system_id], user)
+        self.assertItemsEqual([node1], nodes_started)
+
+    def test__does_not_try_to_start_nodes_not_allocated_to_user(self):
+        user1 = factory.make_User()
+        [node1] = self.make_acquired_nodes_with_macs(user1, count=1)
+        node1.power_type = 'ether_wake'  # can be started.
+        node1.save()
+        user2 = factory.make_User()
+        [node2] = self.make_acquired_nodes_with_macs(user2, count=1)
+        node2.power_type = 'ether_wake'  # can be started.
+        node2.save()
+
+        self.patch(node_module, 'power_on_nodes')
+        self.patch(node_module, 'wait_for_power_commands')
+        nodes_started = Node.objects.start_nodes(
+            [node1.system_id, node2.system_id], user1)
+
+        # Since no power commands were sent to the node, it isn't
+        # returned by start_nodes().
+        # test__only_returns_nodes_for_which_power_commands_have_been_sent()
+        # demonstrates this behaviour.
+        self.assertItemsEqual([node1], nodes_started)
+
+    # XXX: GavinPanella 2014-10-30 bug=1387696: Flaky test, returning wrong IP
+    # addresses. Appears unrelated to the changes that highlighted this.
+    @skip("Flaky; returns incorrect IP addresses")
+    def test__does_not_generate_host_maps_if_not_on_managed_interface(self):
+        cluster = factory.make_NodeGroup()
+        managed_interface = factory.make_NodeGroupInterface(
+            nodegroup=cluster,
+            management=NODEGROUPINTERFACE_MANAGEMENT.DHCP_AND_DNS)
+        unmanaged_interface = factory.make_NodeGroupInterface(
+            nodegroup=cluster,
+            management=NODEGROUPINTERFACE_MANAGEMENT.DEFAULT)
+        user = factory.make_User()
+        [node1, node2] = self.make_acquired_nodes_with_macs(
+            user, nodegroup=cluster, count=2)
+        # Give the node a PXE MAC address on the cluster's interface.
+        node1_mac = node1.get_pxe_mac()
+        node1_mac.cluster_interface = managed_interface
+        node1_mac.save()
+        node2_mac = node1.get_pxe_mac()
+        node2_mac.cluster_interface = unmanaged_interface
+        node2_mac.save()
+
+        node1_ip = factory.make_ipv4_address()
+        claim_static_ip_addresses = self.patch(
+            node_module.Node, 'claim_static_ip_addresses')
+        claim_static_ip_addresses.side_effect = [
+            [(node1_ip, node1_mac.mac_address)],
+            [(factory.make_ipv4_address(), node2_mac.mac_address)],
+            ]
+
+        update_host_maps = self.patch(node_module, "update_host_maps")
+        Node.objects.start_nodes([node1.system_id, node2.system_id], user)
+        self.expectThat(update_host_maps, MockCalledOnceWith(ANY))
+
+        observed_static_mappings = update_host_maps.call_args[0][0]
+
+        [observed_cluster] = observed_static_mappings.keys()
+        self.expectThat(observed_cluster.uuid, Equals(cluster.uuid))
+
+        observed_claims = observed_static_mappings.values()
+        self.expectThat(
+            observed_claims,
+            Equals([{node1_ip: node1_mac.mac_address}]))
+
+
+class NodeManagerTest_StopNodes(MAASServerTestCase):
+
+    def make_nodes_with_macs(self, user, nodegroup=None, count=3):
+        nodes = []
+        for _ in xrange(count):
+            node = factory.make_node_with_mac_attached_to_nodegroupinterface(
+                nodegroup=nodegroup, status=NODE_STATUS.READY,
+                power_type='virsh')
+            node.acquire(user)
+            nodes.append(node)
+        return nodes
+
+    def test_stop_nodes_stops_nodes(self):
+        wait_for_power_commands = self.patch_autospec(
+            node_module, 'wait_for_power_commands')
+        power_off_nodes = self.patch_autospec(node_module, "power_off_nodes")
+        power_off_nodes.side_effect = lambda nodes: {
+            system_id: Deferred() for system_id, _, _, _ in nodes}
+
+        user = factory.make_User()
+        nodes = self.make_nodes_with_macs(user)
+        power_infos = list(node.get_effective_power_info() for node in nodes)
+
+        stop_mode = factory.make_name('stop-mode')
+        nodes_stopped = Node.objects.stop_nodes(
+            list(node.system_id for node in nodes), user, stop_mode)
+
+        self.assertItemsEqual(nodes, nodes_stopped)
+        self.assertThat(power_off_nodes, MockCalledOnceWith(ANY))
+        self.assertThat(wait_for_power_commands, MockCalledOnceWith(ANY))
+
+        nodes_stop_info_observed = power_off_nodes.call_args[0][0]
+        nodes_stop_info_expected = [
+            (node.system_id, node.hostname, node.nodegroup.uuid, power_info)
+            for node, power_info in izip(nodes, power_infos)
+        ]
+
+        # The stop mode is added into the power info that's passed.
+        for _, _, _, power_info in nodes_stop_info_expected:
+            power_info.power_parameters['power_off_mode'] = stop_mode
+
+        # If the following fails the diff is big, but it's useful.
+        self.maxDiff = None
+
+        self.assertItemsEqual(
+            nodes_stop_info_expected,
+            nodes_stop_info_observed)
+
+    def test_stop_nodes_ignores_uneditable_nodes(self):
+        owner = factory.make_User()
+        nodes = self.make_nodes_with_macs(owner)
+
+        user = factory.make_User()
+        nodes_stopped = Node.objects.stop_nodes(
+            list(node.system_id for node in nodes), user)
+
+        self.assertItemsEqual([], nodes_stopped)
+
+    def test_stop_nodes_does_not_attempt_power_off_if_no_power_type(self):
+        # If the node has a power_type set to UNKNOWN_POWER_TYPE, stop_nodes()
+        # won't attempt to power it off.
+        user = factory.make_User()
+        [node] = self.make_nodes_with_macs(user, count=1)
+        node.power_type = ""
+        node.save()
+
+        nodes_stopped = Node.objects.stop_nodes([node.system_id], user)
+        self.assertItemsEqual([], nodes_stopped)
+
+    def test_stop_nodes_does_not_attempt_power_off_if_cannot_be_stopped(self):
+        # If the node has a power_type that MAAS knows stopping does not work,
+        # stop_nodes() won't attempt to power it off.
+        user = factory.make_User()
+        [node] = self.make_nodes_with_macs(user, count=1)
+        node.power_type = "ether_wake"
+        node.save()
+
+        nodes_stopped = Node.objects.stop_nodes([node.system_id], user)
+        self.assertItemsEqual([], nodes_stopped)
+
+    def test__raises_failures_for_nodes_that_cannot_be_stopped(self):
+        power_off_nodes = self.patch(node_module, "power_off_nodes")
+        power_off_nodes.return_value = {
+            factory.make_name("system_id"): defer.fail(
+                ZeroDivisionError("Ee by gum lad, that's a rum 'un.")),
+            factory.make_name("system_id"): defer.succeed({}),
+        }
+
+        failures = self.assertRaises(
+            MultipleFailures, Node.objects.stop_nodes, [], factory.make_User())
+        [failure] = failures.args
+        self.assertThat(failure.value, IsInstance(ZeroDivisionError))
+
+
+>>>>>>> MERGE-SOURCE
 class TestNodeTransitionMonitors(MAASServerTestCase):
 
     def prepare_rpc(self):

=== modified file 'src/maasserver/node_action.py'
=== modified file 'src/maasserver/tests/test_middleware.py'
=== modified file 'src/maasserver/tests/test_node_action.py'
=== modified file 'src/maasserver/views/nodes.py'
--- src/maasserver/views/nodes.py	2014-10-24 23:45:33 +0000
+++ src/maasserver/views/nodes.py	2014-10-30 18:48:30 +0000
@@ -591,8 +591,13 @@
         context['nodecommissionresults'] = commissioning_results
 
         installation_results = NodeResult.objects.filter(
+<<<<<<< TREE
             node=node, result_type=RESULT_TYPE.INSTALLATION)
         if len(installation_results) > 1:
+=======
+            node=node, result_type=RESULT_TYPE.INSTALLING)
+        if len(installation_results) > 1:
+>>>>>>> MERGE-SOURCE
             for result in installation_results:
                 result.name = re.sub('[_.]', ' ', result.name)
             context['nodeinstallresults'] = installation_results

=== modified file 'src/maasserver/views/tests/test_nodes.py'
--- src/maasserver/views/tests/test_nodes.py	2014-10-29 04:34:42 +0000
+++ src/maasserver/views/tests/test_nodes.py	2014-10-30 18:48:30 +0000
@@ -1528,6 +1528,7 @@
         else:
             self.fail("Found more than one link: %s" % links)
 
+<<<<<<< TREE
     def get_installation_results_link(self, display):
         """Find the results link in `display`.
 
@@ -1545,6 +1546,25 @@
         elif len(links) > 1:
             return links
 
+=======
+    def get_installing_results_link(self, display):
+        """Find the results link in `display`.
+
+        :param display: Results display section for a node, as returned by
+            `request_results_display`.
+        :return: `lxml.html.HtmlElement` for the link to the node's
+            installation results, as found in `display`; or `None` if it was
+            not present.
+        """
+        links = display.cssselect('a')
+        if len(links) == 0:
+            return None
+        elif len(links) == 1:
+            return links[0]
+        elif len(links) > 1:
+            return links
+
+>>>>>>> MERGE-SOURCE
     def test_view_node_links_to_commissioning_results_if_appropriate(self):
         self.client_log_in(as_admin=True)
         result = factory.make_NodeResult_for_commissioning()
@@ -1624,8 +1644,13 @@
         self.logged_in_user = user
         result = factory.make_NodeResult_for_installation(node=node)
         section = self.request_results_display(
+<<<<<<< TREE
             result.node, RESULT_TYPE.INSTALLATION)
         link = self.get_installation_results_link(section)
+=======
+            result.node, RESULT_TYPE.INSTALLING)
+        link = self.get_installing_results_link(section)
+>>>>>>> MERGE-SOURCE
         self.assertNotIn(
             normalise_whitespace(link.text_content()),
             ('', None))
@@ -1667,6 +1692,35 @@
             ContainsAll(
                 [normalise_whitespace(link.text_content()) for link in links]))
 
+    def test_view_node_shows_single_installing_result(self):
+        self.client_log_in(as_admin=True)
+        result = factory.make_NodeResult_for_installing()
+        section = self.request_results_display(
+            result.node, RESULT_TYPE.INSTALLING)
+        link = self.get_installing_results_link(section)
+        self.assertEqual(
+            "install log",
+            normalise_whitespace(link.text_content()))
+
+    def test_view_node_shows_multiple_installing_results(self):
+        self.client_log_in(as_admin=True)
+        node = factory.make_Node()
+        num_results = randint(2, 5)
+        results_names = []
+        for _ in range(num_results):
+            node_result = factory.make_NodeResult_for_installing(node=node)
+            results_names.append(node_result.name)
+        section = self.request_results_display(
+            node, RESULT_TYPE.INSTALLING)
+        links = self.get_installing_results_link(section)
+        expected_results_names = list(reversed(results_names))
+        observed_results_names = list(
+            normalise_whitespace(link.text_content())
+            for link in links)
+        self.assertListEqual(
+            expected_results_names,
+            observed_results_names)
+
 
 class NodeListingSelectionJSControls(SeleniumTestCase):
 

=== modified file 'src/metadataserver/api.py'
--- src/metadataserver/api.py	2014-10-24 23:45:33 +0000
+++ src/metadataserver/api.py	2014-10-30 18:48:30 +0000
@@ -76,7 +76,7 @@
     NodeUserData,
     )
 from metadataserver.models.commissioningscript import (
-    BUILTIN_COMMISSIONING_SCRIPTS,
+    get_builtin_commissioning_scripts,
     )
 from piston.utils import rc
 from provisioningserver.events import (
@@ -229,8 +229,10 @@
         script_result = int(request.POST.get('script_result', 0))
         for name, uploaded_file in request.FILES.items():
             raw_content = uploaded_file.read()
-            if name in BUILTIN_COMMISSIONING_SCRIPTS:
-                postprocess_hook = BUILTIN_COMMISSIONING_SCRIPTS[name]['hook']
+            builtin_commissioning_scripts = (
+                get_builtin_commissioning_scripts())
+            if name in builtin_commissioning_scripts:
+                postprocess_hook = builtin_commissioning_scripts[name]['hook']
                 postprocess_hook(
                     node=node, output=raw_content,
                     exit_status=script_result)
@@ -280,7 +282,15 @@
 
         if node.status == NODE_STATUS.COMMISSIONING:
             self._store_commissioning_results(node, request)
-            store_node_power_parameters(node, request)
+            # XXX 2014-10-21 newell, bug=1382075
+            # Auto detection for IPMI tries to save power parameters
+            # for Moonshot.  This causes issues if the node's power type
+            # is already MSCM as it uses SSH instead of IPMI.  This fix
+            # is temporary as power parameters should not be overwritten
+            # during commissioning because MAAS already has knowledge to
+            # boot the node.
+            if node.power_type != "mscm":
+                store_node_power_parameters(node, request)
             target_status = self.signaling_statuses.get(status)
         elif node.status == NODE_STATUS.DEPLOYING:
             self._store_installation_results(node, request)

=== modified file 'src/metadataserver/models/commissioningscript.py'
--- src/metadataserver/models/commissioningscript.py	2014-10-29 22:37:02 +0000
+++ src/metadataserver/models/commissioningscript.py	2014-10-30 18:48:30 +0000
@@ -14,8 +14,8 @@
 
 __metaclass__ = type
 __all__ = [
-    'BUILTIN_COMMISSIONING_SCRIPTS',
     'CommissioningScript',
+    'get_builtin_commissioning_scripts',
     'inject_lldp_result',
     'inject_lshw_result',
     'inject_result',
@@ -43,6 +43,7 @@
     )
 from lxml import etree
 from maasserver.fields import MAC
+from maasserver.models import Config
 from maasserver.models.tag import Tag
 from metadataserver import DefaultMeta
 from metadataserver.enum import RESULT_TYPE
@@ -352,6 +353,7 @@
 LIST_MODALIASES_OUTPUT_NAME = '00-maas-04-list-modaliases.out'
 LIST_MODALIASES_SCRIPT = \
     'find /sys -name modalias -print0 | xargs -0 cat | sort -u'
+DHCP_UNCONFIGURED_INTERFACES_NAME = '00-maas-05-dhcp-unconfigured-ifaces'
 
 
 def null_hook(node, output, exit_status):
@@ -397,7 +399,7 @@
         'content': LIST_MODALIASES_SCRIPT.encode('ascii'),
         'hook': null_hook,
     },
-    '00-maas-05-dhcp-unconfigured-ifaces': {
+    DHCP_UNCONFIGURED_INTERFACES_NAME: {
         'content': make_function_call_script(dhcp_explore),
         'hook': null_hook,
     },
@@ -430,6 +432,20 @@
 add_names_to_scripts(BUILTIN_COMMISSIONING_SCRIPTS)
 
 
+def get_builtin_commissioning_scripts():
+    """Get the builtin commissioning scripts.
+
+    The builtin scripts exposed may vary based on config settings.
+    """
+    scripts = BUILTIN_COMMISSIONING_SCRIPTS.copy()
+
+    config_key = 'enable_dhcp_discovery_on_unconfigured_interfaces'
+    if not Config.objects.get_config(config_key):
+        del scripts[DHCP_UNCONFIGURED_INTERFACES_NAME]
+
+    return scripts
+
+
 def add_script_to_archive(tarball, name, content, mtime):
     """Add a commissioning script to an archive of commissioning scripts."""
     assert isinstance(content, bytes), "Script content must be binary."
@@ -447,7 +463,7 @@
     """Utility for the collection of `CommissioningScript`s."""
 
     def _iter_builtin_scripts(self):
-        for script in BUILTIN_COMMISSIONING_SCRIPTS.itervalues():
+        for script in get_builtin_commissioning_scripts().itervalues():
             yield script['name'], script['content']
 
     def _iter_user_scripts(self):
@@ -500,8 +516,9 @@
     NodeResult.objects.store_data(
         node, name, script_result=exit_status,
         result_type=RESULT_TYPE.COMMISSIONING, data=Bin(output))
-    if name in BUILTIN_COMMISSIONING_SCRIPTS:
-        postprocess_hook = BUILTIN_COMMISSIONING_SCRIPTS[name]['hook']
+    builtin_commissioning_scripts = get_builtin_commissioning_scripts()
+    if name in builtin_commissioning_scripts:
+        postprocess_hook = builtin_commissioning_scripts[name]['hook']
         postprocess_hook(node=node, output=output, exit_status=exit_status)
 
 

=== modified file 'src/metadataserver/models/tests/test_noderesults.py'
--- src/metadataserver/models/tests/test_noderesults.py	2014-10-29 22:37:02 +0000
+++ src/metadataserver/models/tests/test_noderesults.py	2014-10-30 18:48:30 +0000
@@ -35,6 +35,7 @@
 
 from fixtures import FakeLogger
 from maasserver.fields import MAC
+from maasserver.models import Config
 from maasserver.models.tag import Tag
 from maasserver.testing.factory import factory
 from maasserver.testing.orm import reload_object
@@ -55,7 +56,10 @@
     )
 from metadataserver.models.commissioningscript import (
     ARCHIVE_PREFIX,
+    BUILTIN_COMMISSIONING_SCRIPTS,
+    DHCP_UNCONFIGURED_INTERFACES_NAME,
     extract_router_mac_addresses,
+    get_builtin_commissioning_scripts,
     inject_lldp_result,
     inject_lshw_result,
     inject_result,
@@ -676,3 +680,26 @@
         logger = self.useFixture(FakeLogger(name='commissioningscript'))
         update_hardware_details(factory.make_Node(), b"garbage", exit_status=1)
         self.assertEqual("", logger.output)
+
+
+class TestGetBuiltinCommissioningScripts(MAASServerTestCase):
+
+    def test__includes_all_builtin_commissioning_scripts_by_default(self):
+        self.assertItemsEqual(
+            BUILTIN_COMMISSIONING_SCRIPTS,
+            get_builtin_commissioning_scripts(),
+        )
+
+    def test__excludes_dhcp_discovery_when_disabled(self):
+        Config.objects.set_config(
+            'enable_dhcp_discovery_on_unconfigured_interfaces', False)
+        self.assertNotIn(
+            DHCP_UNCONFIGURED_INTERFACES_NAME,
+            get_builtin_commissioning_scripts())
+
+    def test__includes_dhcp_discovery_when_enabled(self):
+        Config.objects.set_config(
+            'enable_dhcp_discovery_on_unconfigured_interfaces', True)
+        self.assertIn(
+            DHCP_UNCONFIGURED_INTERFACES_NAME,
+            get_builtin_commissioning_scripts())

=== modified file 'src/metadataserver/tests/test_api.py'
--- src/metadataserver/tests/test_api.py	2014-10-24 23:45:33 +0000
+++ src/metadataserver/tests/test_api.py	2014-10-30 18:48:30 +0000
@@ -793,6 +793,21 @@
         node = reload_object(node)
         self.assertEqual(0, len(node.tags.all()))
 
+    def test_signal_current_power_type_mscm_does_not_store_params(self):
+        node = factory.make_Node(
+            power_type="mscm", status=NODE_STATUS.COMMISSIONING)
+        client = make_node_client(node=node)
+        params = dict(
+            power_address=factory.make_string(),
+            power_user=factory.make_string(),
+            power_pass=factory.make_string())
+        response = call_signal(
+            client, power_type="moonshot", power_parameters=json.dumps(params))
+        self.assertEqual(httplib.OK, response.status_code, response.content)
+        node = reload_object(node)
+        self.assertEqual("mscm", node.power_type)
+        self.assertNotEqual(params, node.power_parameters)
+
     def test_signal_refuses_bad_power_type(self):
         node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
         client = make_node_client(node=node)

=== modified file 'src/provisioningserver/rpc/boot_images.py'
--- src/provisioningserver/rpc/boot_images.py	2014-10-30 13:17:51 +0000
+++ src/provisioningserver/rpc/boot_images.py	2014-10-30 18:48:30 +0000
@@ -18,8 +18,12 @@
     "is_import_boot_images_running",
     ]
 
+<<<<<<< TREE
 import os
 from urlparse import urlparse
+=======
+from urlparse import urlparse
+>>>>>>> MERGE-SOURCE
 
 from provisioningserver import concurrency
 from provisioningserver.auth import get_maas_user_gpghome
@@ -47,6 +51,16 @@
     return hosts
 
 
+def get_hosts_from_sources(sources):
+    """Return set of hosts that are contained in the given sources."""
+    hosts = set()
+    for source in sources:
+        url = urlparse(source['url'])
+        if url.hostname is not None:
+            hosts.add(url.hostname)
+    return hosts
+
+
 @synchronous
 def _run_import(sources, http_proxy=None, https_proxy=None):
     """Run the import.

=== modified file 'src/provisioningserver/rpc/clusterservice.py'
=== modified file 'src/provisioningserver/rpc/power.py'
=== modified file 'src/provisioningserver/rpc/tests/test_boot_images.py'
--- src/provisioningserver/rpc/tests/test_boot_images.py	2014-10-30 13:17:51 +0000
+++ src/provisioningserver/rpc/tests/test_boot_images.py	2014-10-30 18:48:30 +0000
@@ -76,6 +76,13 @@
         self.assertItemsEqual(hosts, get_hosts_from_sources(sources))
 
 
+class TestGetHostsFromSources(PservTestCase):
+
+    def test__returns_set_of_hosts_from_sources(self):
+        sources, hosts = make_sources()
+        self.assertItemsEqual(hosts, get_hosts_from_sources(sources))
+
+
 class TestRunImport(PservTestCase):
 
     def make_archive_url(self, name=None):

=== modified file 'src/provisioningserver/rpc/tests/test_clusterservice.py'
=== modified file 'src/provisioningserver/rpc/tests/test_power.py'