Merge lp:~jtv/maas/1.6-bug-1354511 into lp:~maas-committers/maas/trunk

[Jeroen T. Vermeulen]

Backport trunk r2668: When timing out nodes that haven't finished commissioning, compare the last-update timestamp to the database clock (from which it was also generated), not to the Python-side clock. Timezone skew between the two could cause nodes to time out immediately, or hours late.

Straight backport. For self-approval.

Jeroen

=== modified file 'src/maasserver/api.py'
=== modified file 'src/maasserver/rpc/regionservice.py'
=== modified file 'src/maasserver/rpc/tests/test_regionservice.py'
--- src/maasserver/rpc/tests/test_regionservice.py	2014-08-08 15:02:16 +0000
+++ src/maasserver/rpc/tests/test_regionservice.py	2014-08-08 20:15:32 +0000
@@ -1170,18 +1170,33 @@
         getPort = getServiceNamed.return_value.getPort
         getPort.side_effect = asynchronous(lambda: example_port)
 
-        example_ipv4_addrs = {
-            factory.getRandomIPAddress(),
-            factory.getRandomIPAddress(),
-        }
-        example_ipv6_addrs = {
-            factory.make_ipv6_address(),
-            factory.make_ipv6_address(),
-        }
-        example_link_local_addrs = {
-            factory.getRandomIPInNetwork(netaddr.ip.IPV4_LINK_LOCAL),
-            factory.getRandomIPInNetwork(netaddr.ip.IPV6_LINK_LOCAL),
-        }
+<<<<<<< TREE
+        example_ipv4_addrs = {
+            factory.getRandomIPAddress(),
+            factory.getRandomIPAddress(),
+        }
+        example_ipv6_addrs = {
+            factory.make_ipv6_address(),
+            factory.make_ipv6_address(),
+        }
+        example_link_local_addrs = {
+            factory.getRandomIPInNetwork(netaddr.ip.IPV4_LINK_LOCAL),
+            factory.getRandomIPInNetwork(netaddr.ip.IPV6_LINK_LOCAL),
+        }
+=======
+        example_ipv4_addrs = {
+            factory.getRandomIPAddress(),
+            factory.getRandomIPAddress(),
+        }
+        example_ipv6_addrs = {
+            factory.get_random_ipv6_address(),
+            factory.get_random_ipv6_address(),
+        }
+        example_link_local_addrs = {
+            factory.getRandomIPInNetwork(netaddr.ip.IPV4_LINK_LOCAL),
+            factory.getRandomIPInNetwork(netaddr.ip.IPV6_LINK_LOCAL),
+        }
+>>>>>>> MERGE-SOURCE
         get_all_interface_addresses = self.patch(
             regionservice, "get_all_interface_addresses")
         get_all_interface_addresses.return_value = (
 
=== modified file 'src/maasserver/tests/test_api_commissioning.py'
=== modified file 'src/maasserver/views/tests/test_rpc.py'
=== modified file 'src/metadataserver/tests/test_address.py'
=== modified file 'src/provisioningserver/boot/tests/test_powernv.py'
=== modified file 'src/provisioningserver/drivers/osystem/ubuntu.py'
--- src/provisioningserver/drivers/osystem/ubuntu.py	2014-07-11 14:07:08 +0000
+++ src/provisioningserver/drivers/osystem/ubuntu.py	2014-08-08 20:15:32 +0000
@@ -24,10 +24,9 @@
 
 DISTRO_SERIES_CHOICES = {
     'precise': 'Ubuntu 12.04 LTS "Precise Pangolin"',
-    'quantal': 'Ubuntu 12.10 "Quantal Quetzal"',
-    'raring': 'Ubuntu 13.04 "Raring Ringtail"',
     'saucy': 'Ubuntu 13.10 "Saucy Salamander"',
     'trusty': 'Ubuntu 14.04 LTS "Trusty Tahr"',
+    'utopic': 'Ubuntu 14.10 "Utopic Unicorn"',
 }
 
 COMMISIONING_DISTRO_SERIES = [
 
=== modified file 'src/provisioningserver/import_images/boot_resources.py'
--- src/provisioningserver/import_images/boot_resources.py	2014-07-29 16:27:14 +0000
+++ src/provisioningserver/import_images/boot_resources.py	2014-08-08 20:15:32 +0000
@@ -249,19 +249,34 @@
 
     snapshot_path = download_all_boot_resources(
         sources, storage, product_mapping)
+<<<<<<< TREE
 
     maaslog.info("Writing metadata and iSCSI targets.")
     write_snapshot_metadata(snapshot_path, meta_file_content)
     write_targets_conf(snapshot_path)
 
     maaslog.info("Installing boot images snapshot %s.", snapshot_path)
+=======
+
+    logger.info("Writing metadata and iSCSI targets.")
+    write_snapshot_metadata(snapshot_path, meta_file_content)
+    write_targets_conf(snapshot_path)
+
+    logger.info("Installing boot images snapshot %s.", snapshot_path)
+>>>>>>> MERGE-SOURCE
     install_boot_loaders(snapshot_path)
 
     # If we got here, all went well.  This is now truly the "current" snapshot.
     update_current_symlink(storage, snapshot_path)
+<<<<<<< TREE
     maaslog.info("Updating iSCSI targets.")
     update_targets_conf(snapshot_path)
     maaslog.info("Import done.")
+=======
+    logger.info("Updating iSCSI targets.")
+    update_targets_conf(snapshot_path)
+    logger.info("Import done.")
+>>>>>>> MERGE-SOURCE
 
 
 def main(args):
 
=== modified file 'src/provisioningserver/import_images/tests/test_boot_resources.py'
=== modified file 'src/provisioningserver/tests/test_upgrade_cluster.py'
=== modified file 'src/provisioningserver/upgrade_cluster.py'
--- src/provisioningserver/upgrade_cluster.py	2014-07-30 11:08:46 +0000
+++ src/provisioningserver/upgrade_cluster.py	2014-08-08 20:15:32 +0000
@@ -44,6 +44,7 @@
     drill_down,
     list_subdirs,
     )
+<<<<<<< TREE
 from provisioningserver.import_images.boot_resources import (
     update_targets_conf,
     write_targets_conf,
@@ -52,6 +53,14 @@
 
 
 maaslog = get_maas_logger("cluster_upgrade")
+=======
+from provisioningserver.import_images.boot_resources import (
+    write_targets_conf,
+    update_targets_conf,
+    )
+
+logger = getLogger(__name__)
+>>>>>>> MERGE-SOURCE
 
 
 def make_maas_own_boot_resources():