Merge lp:~blake-rouse/maas/run-curtin-debug into lp:~maas-committers/maas/trunk

[Blake Rouse]

Add configuration option to tell curtin to install with higher verbosity.

This allows a user to set curtin_verbose to True over the API to get more detailed curtin installation logs.

[Andres Rodriguez (andreserl)]

lgtm!

review: Approve

=== modified file 'src/maasserver/forms_settings.py'
--- src/maasserver/forms_settings.py	2015-08-14 13:48:59 +0000
+++ src/maasserver/forms_settings.py	2015-08-18 18:04:23 +0000
@@ -319,6 +319,16 @@
                 (IMPORT_RESOURCES_SERVICE_PERIOD.total_seconds() / 60.0))
         }
     },
+    'curtin_verbose': {
+        'default': False,
+        'form': forms.BooleanField,
+        'form_kwargs': {
+            'required': False,
+            'label': (
+                "Run the fast-path installer with higher verbosity. This "
+                "provides more detail in the installation logs.")
+        }
+    },
 }
 
 

=== modified file 'src/maasserver/models/config.py'
--- src/maasserver/models/config.py	2015-08-14 13:48:59 +0000
+++ src/maasserver/models/config.py	2015-08-18 18:04:23 +0000
@@ -68,6 +68,8 @@
         # Third Party
         'enable_third_party_drivers': True,
         'enable_disk_erasing_on_release': False,
+        # Curtin.
+        'curtin_verbose': False,
         # # /settings
         }
 

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2015-08-14 13:48:59 +0000
+++ src/maasserver/preseed.py	2015-08-18 18:04:23 +0000
@@ -244,6 +244,19 @@
     return []
 
 
+def compose_curtin_verbose_preseed():
+    """Return the curtin options for the preseed that will tell curtin
+    to run with high verbosity.
+    """
+    if Config.objects.get_config("curtin_verbose"):
+        return [yaml.safe_dump({
+            "verbosity": 3,
+            "showtrace": True,
+            })]
+    else:
+        return []
+
+
 def get_curtin_userdata(node):
     """Return the curtin user-data.
 
@@ -257,6 +270,7 @@
     network_config = compose_curtin_network_preseed_for(node)
     swap_config = compose_curtin_swap_preseed(node)
     kernel_config = compose_curtin_kernel_preseed(node)
+    verbose_config = compose_curtin_verbose_preseed()
 
     # Get the storage configration if curtin supports custom storage.
     storage_config = compose_curtin_storage_config(node)
@@ -271,7 +285,7 @@
     return pack_install(
         configs=(
             [main_config] + reporter_config + storage_config +
-            network_config + swap_config + kernel_config),
+            network_config + swap_config + kernel_config + verbose_config),
         args=[installer_url])
 
 

=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2015-08-14 13:48:59 +0000
+++ src/maasserver/tests/test_preseed.py	2015-08-18 18:04:23 +0000
@@ -44,6 +44,7 @@
     compose_curtin_maas_reporter,
     compose_curtin_network_preseed,
     compose_curtin_swap_preseed,
+    compose_curtin_verbose_preseed,
     compose_enlistment_preseed_url,
     compose_preseed_url,
     GENERIC_FILENAME,
@@ -863,6 +864,21 @@
                           ])
 
 
+class TestComposeCurtinVerbose(MAASServerTestCase):
+
+    def test__returns_empty_when_false(self):
+        Config.objects.set_config("curtin_verbose", False)
+        self.assertEqual([], compose_curtin_verbose_preseed())
+
+    def test__returns_verbosity_config(self):
+        Config.objects.set_config("curtin_verbose", True)
+        preseed = compose_curtin_verbose_preseed()
+        self.assertEquals({
+            "verbosity": 3,
+            "showtrace": True,
+            }, yaml.load(preseed[0]))
+
+
 class TestComposeCurtinNetworkPreseed(MAASServerTestCase):
 
     def test__returns_list_of_yaml_strings(self):