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

[Jeroen T. Vermeulen]

Continue to accept (but do not use) the old “boot” section in pserv.yaml. Otherwise, upgrade breaks while parsing this file.

Meant for backport to 1.5, but I think it makes sense to land on trunk as well. It would be nice to warn users about the legacy entries at some point as well, but fixing the crash is the most urgent part.

Jeroen

[Graham Binns (gmb)]

Looks good to me.

review: Approve

=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2014-03-28 06:51:59 +0000
+++ src/provisioningserver/config.py	2014-04-07 09:17:07 +0000
@@ -128,6 +128,28 @@
     generator = String(if_missing=b"http://localhost/MAAS/api/1.0/pxeconfig/")
 
 
+class ConfigLegacyEphemeral(Schema):
+    """Legacy `eephemeral` section in `pserv.yaml` prior to MAAS 1.5.
+
+    This has been replaced with boot-source selection in `bootresources.yaml`.
+    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.
+
+    The new version of this config section lives in `bootresources.yaml`.  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."""
 
@@ -307,6 +329,7 @@
     broker = ConfigBroker
     tftp = ConfigTFTP
     rpc = ConfigRPC
+    boot = ConfigLegacyBoot
 
 
 class BootConfig(ConfigBase):

=== modified file 'src/provisioningserver/tests/test_config.py'
--- src/provisioningserver/tests/test_config.py	2014-03-28 16:47:54 +0000
+++ src/provisioningserver/tests/test_config.py	2014-04-07 09:17:07 +0000
@@ -354,6 +354,14 @@
             '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)
@@ -387,6 +395,34 @@
             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:5243/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 TestBootConfig(MAASTestCase):
     """Tests for `provisioningserver.config.BootConfig`."""