Merge lp:~allenap/maas/preseed-cluster-host into lp:~maas-committers/maas/trunk

[Gavin Panella]

Include a 'cluster_host' setting in the preseed template rendering context.

This is set to the IP address of the first managed interface of the cluster.

[Gavin Panella (allenap)]

I've realised that cluster_host can already be derived in the preseed environment:

  node.get_managed_interface().ip

This is less convenient, but it works right now, and doesn't require backporting.

[Andres Rodriguez (andreserl)]

Hi Gavin,

I don't think that node.get_managed_interface() exists right? Shouldn't it be nodegroup.get_managed_interface().ip? I'm guessing this is being handled automatically for each of the cluster controllers as in it provides the IP of the cluster controller from which the node is trying to install from right?

[Andres Rodriguez (andreserl)]

Ok I have tested this in a single node MAAS and it seems to work like a charm. The node.nodegroup.get_managed_interface().ip didn't really work.

[Andres Rodriguez (andreserl)]

No my bad... this doesn't work unfortunately... we need the IP of the cluster node regardless of whether we are managing an interface or not .... (I think that's why it doesn't work).

[Julian Edwards (julian-edwards)]

review: Approve

[Andres Rodriguez (andreserl)]

Forgot to add the needs fixing since it doesn't work :(

review: Needs Fixing

[Julian Edwards (julian-edwards)]

On 05/03/13 14:20, Andres Rodriguez wrote:
> Review: Needs Fixing
>
> Forgot to add the needs fixing since it doesn't work :(
>

I approved on the basis that the branch itself is fine to land, even
though your particular problem is not fixed.

=== modified file 'src/maasserver/preseed.py'
--- src/maasserver/preseed.py	2012-11-27 10:39:51 +0000
+++ src/maasserver/preseed.py	2013-02-21 23:39:27 +0000
@@ -225,7 +225,13 @@
         Config.objects.get_config('main_archive'))
     ports_archive_hostname, ports_archive_directory = get_hostname_and_path(
         Config.objects.get_config('ports_archive'))
-    base_url = nodegroup.maas_url if nodegroup is not None else None
+    if nodegroup is None:
+        base_url = None
+        cluster_host = None
+    else:
+        base_url = nodegroup.maas_url
+        cluster_if = nodegroup.get_managed_interface()
+        cluster_host = None if cluster_if is None else cluster_if.ip
     return {
         'main_archive_hostname': main_archive_hostname,
         'main_archive_directory': main_archive_directory,
@@ -236,6 +242,7 @@
         'server_url': absolute_reverse('nodes_handler', base_url=base_url),
         'metadata_enlist_url': absolute_reverse('enlist', base_url=base_url),
         'http_proxy': Config.objects.get_config('http_proxy'),
+        'cluster_host': cluster_host,
         }
 
 
 
=== modified file 'src/maasserver/tests/test_preseed.py'
--- src/maasserver/tests/test_preseed.py	2012-11-27 10:26:19 +0000
+++ src/maasserver/tests/test_preseed.py	2013-02-21 23:39:27 +0000
@@ -21,6 +21,7 @@
 from maasserver.enum import (
     ARCHITECTURE,
     NODE_STATUS,
+    NODEGROUPINTERFACE_MANAGEMENT,
     PRESEED_TYPE,
     )
 from maasserver.models import Config
@@ -327,10 +328,9 @@
         context = get_preseed_context(release, nodegroup)
         self.assertItemsEqual(
             ['release', 'metadata_enlist_url', 'server_host', 'server_url',
-            'main_archive_hostname', 'main_archive_directory',
-            'ports_archive_hostname', 'ports_archive_directory',
-            'http_proxy',
-            ],
+             'cluster_host', 'main_archive_hostname', 'main_archive_directory',
+             'ports_archive_hostname', 'ports_archive_directory',
+             'http_proxy'],
             context)
 
     def test_get_preseed_context_archive_refs(self):
@@ -358,6 +358,35 @@
                 context['ports_archive_directory'],
             ))
 
+    def test_preseed_context_cluster_host(self):
+        # The cluster_host context variable is derived from the nodegroup.
+        release = factory.getRandomString()
+        nodegroup = factory.make_node_group(maas_url=factory.getRandomString())
+        context = get_preseed_context(release, nodegroup)
+        self.assertIsNotNone(context["cluster_host"])
+        self.assertEqual(
+            nodegroup.get_managed_interface().ip,
+            context["cluster_host"])
+
+    def test_preseed_context_null_cluster_host_if_unmanaged(self):
+        # If the nodegroup has no managed interface recorded, which is
+        # possible in the data model but would be a bit weird, the
+        # cluster_host context variable is present, but None.
+        release = factory.getRandomString()
+        nodegroup = factory.make_node_group(maas_url=factory.getRandomString())
+        for interface in nodegroup.nodegroupinterface_set.all():
+            interface.management = NODEGROUPINTERFACE_MANAGEMENT.UNMANAGED
+            interface.save()
+        context = get_preseed_context(release, nodegroup)
+        self.assertIsNone(context["cluster_host"])
+
+    def test_preseed_context_null_cluster_host_if_does_not_exist(self):
+        # If there's no nodegroup, the cluster_host context variable is
+        # present, but None.
+        release = factory.getRandomString()
+        context = get_preseed_context(release)
+        self.assertIsNone(context["cluster_host"])
+
 
 class TestNodePreseedContext(TestCase):
     """Tests for `get_node_preseed_context`."""