Merge lp:~gmb/maas/tweak into lp:~maas-committers/maas/trunk

[Graham Binns]

Make the default value for keyring_data None rather than ''.

Previously, the default was an empty string, which meant that download_resources.download_boot_resources() would treat the empty string as the actual keyring and would ignore the keyring file in favour of it.

[Gavin Panella (allenap)]

The problem is now that clearing the field might leave an empty string in place. This is a minefield.

[Gavin Panella (allenap)]

Oh, don't mind me, I jumped to conclusions.

[Gavin Panella (allenap)]

review: Approve

=== modified file 'src/provisioningserver/config.py'
--- src/provisioningserver/config.py	2014-05-22 14:38:41 +0000
+++ src/provisioningserver/config.py	2014-05-22 16:34:28 +0000
@@ -185,7 +185,7 @@
         if_missing="http://maas.ubuntu.com/images/ephemeral-v2/releases/")
     keyring = String(
         if_missing="/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg")
-    keyring_data = String(if_missing="")
+    keyring_data = String(if_missing=None)
     selections = ForEach(
         ConfigBootSourceSelection,
         if_missing=[ConfigBootSourceSelection.to_python({})])

=== modified file 'src/provisioningserver/tests/test_config.py'
--- src/provisioningserver/tests/test_config.py	2014-05-22 15:12:20 +0000
+++ src/provisioningserver/tests/test_config.py	2014-05-22 16:34:28 +0000
@@ -436,7 +436,7 @@
                         ),
                     'keyring': (
                         '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'),
-                    'keyring_data': '',
+                    'keyring_data': None,
                     'selections': [
                         {
                             'arches': ['*'],
@@ -461,7 +461,7 @@
                         'images/ephemeral-v2/releases/'),
                     'keyring': (
                         '/usr/share/keyrings/ubuntu-cloudimage-keyring.gpg'),
-                    'keyring_data': '',
+                    'keyring_data': None,
                     'selections': [
                         {
                             'arches': ['i386', 'amd64'],