Merge lp:~mpontillo/maas/custom-network-non-ubuntu-1570002 into lp:~maas-committers/maas/trunk

[Mike Pontillo]

Compose networking preseed for non-Ubuntu operating systems.

[Mike Pontillo (mpontillo)]

I tested this with the latest CentOS 7 image, built using scripts provided to me by ltrager (to avoid a bug in the currently-provided images where the curtin hooks fail. (Now that the curtin hooks use Python 2 *or* Python 3, depending on what is available, everything seems to work.)

As expected, the curtin_hooks.py script does not do any interface configuration other than setting the boot interface to DHCP. But now that the data is being provided, it should be possible to change the script to interpret the data and configure the interfaces as-modeled-in-MAAS.

[Lee Trager (ltrager)]

LGTM!

As for the next step I'd prefer to modify curtin to have generic Linux support. This would make deploying any Linux image much easier in MAAS. We also wouldn't have to maintain a different curtin hook for each Linux image which has to work with all versions of curtin.

review: Approve

[Blake Rouse (blake-rouse)]

Looks good. Glad you have tested this with CentOS and have not ran into any issues. Hopefully other custom images will work as well, if not I can adjust those to fix an issues.

review: Approve

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2016-04-18 19:30:35 +0000
+++ src/maasserver/preseed.py	2016-05-03 00:48:52 +0000
@@ -224,15 +224,14 @@
             "from curtin." % node.hostname)
         supports_custom_storage = False
 
+    network_config = compose_curtin_network_config(node)
+
     if node.osystem != "ubuntu":
         maaslog.info(
             "%s: custom network and storage options are only supported on "
-            "Ubuntu. Using flat storage layout and OS default network options."
+            "Ubuntu. Using flat storage layout."
             % node.hostname)
         supports_custom_storage = False
-        network_config = []
-    else:
-        network_config = compose_curtin_network_config(node)
 
     if supports_custom_storage:
         storage_config = compose_curtin_storage_config(node)

=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2016-03-28 13:54:47 +0000
+++ src/maasserver/tests/test_preseed.py	2016-05-03 00:48:52 +0000
@@ -765,22 +765,33 @@
         self.assertThat(mock_compose_storage, MockCalledOnceWith(node))
         self.assertThat(mock_compose_network, MockCalledOnceWith(node))
 
-    def test_get_curtin_userdata_doesnt_call_compose_config_on_otheros(self):
+    def test_get_curtin_userdata_skips_storage_for_non_ubuntu(self):
         node = factory.make_Node_with_Interface_on_Subnet(
             primary_rack=self.rpc_rack_controller)
         arch, subarch = node.architecture.split('/')
         self.configure_get_boot_images_for_node(node, 'xinstall')
         mock_compose_storage = self.patch(
             preseed_module, "compose_curtin_storage_config")
-        mock_compose_network = self.patch(
-            preseed_module, "compose_curtin_network_config")
         self.patch(
             preseed_module, "curtin_supports_custom_storage").value = True
         node.osystem = factory.make_name("osystem")
         user_data = get_curtin_userdata(node)
         self.assertIn("PREFIX='curtin'", user_data)
         self.assertThat(mock_compose_storage, MockNotCalled())
-        self.assertThat(mock_compose_network, MockNotCalled())
+
+    def test_get_curtin_userdata_includes_networking_for_non_ubuntu(self):
+        node = factory.make_Node_with_Interface_on_Subnet(
+            primary_rack=self.rpc_rack_controller)
+        arch, subarch = node.architecture.split('/')
+        self.configure_get_boot_images_for_node(node, 'xinstall')
+        mock_compose_network = self.patch(
+            preseed_module, "compose_curtin_network_config")
+        self.patch(
+            preseed_module, "curtin_supports_custom_storage").value = True
+        node.osystem = factory.make_name("osystem")
+        user_data = get_curtin_userdata(node)
+        self.assertIn("PREFIX='curtin'", user_data)
+        self.assertThat(mock_compose_network, MockCalledOnceWith(node))
 
     def test_get_curtin_userdata_calls_curtin_supports_custom_storage(self):
         node = factory.make_Node_with_Interface_on_Subnet(