Setting static ip= for baremetal PXE boot.

This patch adds a new option "pxe_network_config" to baremetal PXE driver,
if set it tells the driver to append the network configuration to the
kernel cmdline. Initramfs built with network support could then benefit
from this option and avoid the injection of network configuration files
into the image.

DocImpact

Change-Id: I61dc946f42f8a86eaad0e73b033a0d8da4a74e40

2 files changed, 26 insertions, 7 deletions

diff --git a/nova/tests/virt/baremetal/test_pxe.py b/nova/tests/virt/baremetal/test_pxe.py
index 022f9c692..cd4e5c143 100644
--- a/nova/tests/virt/baremetal/test_pxe.py
+++ b/nova/tests/virt/baremetal/test_pxe.py
@@ -116,6 +116,7 @@ class PXEClassMethodsTestCase(BareMetalPXETestCase):
                 'deployment_ari_path': 'eee',
                 'aki_path': 'fff',
                 'ari_path': 'ggg',
+                'network_info': self.test_network_info,
             }
         config = pxe.build_pxe_config(**args)
         self.assertThat(config, matchers.StartsWith('default deploy'))
@@ -140,6 +141,21 @@ class PXEClassMethodsTestCase(BareMetalPXETestCase):
             matchers.Not(matchers.Contains('kernel ddd')),
             ))
 
+    def test_build_pxe_network_config(self):
+        self.flags(
+                pxe_network_config=True,
+                group='baremetal',
+            )
+        net = utils.get_test_network_info(1)
+        config = pxe.build_pxe_network_config(net)
+        self.assertIn('eth0:off', config)
+        self.assertNotIn('eth1', config)
+
+        net = utils.get_test_network_info(2)
+        config = pxe.build_pxe_network_config(net)
+        self.assertIn('eth0:off', config)
+        self.assertIn('eth1:off', config)
+
     def test_build_network_config(self):
         net = utils.get_test_network_info(1)
         config = pxe.build_network_config(net)
@@ -458,7 +474,8 @@ class PXEPublicMethodsTestCase(BareMetalPXETestCase):
         bm_utils.random_alnum(32).AndReturn('alnum')
         pxe.build_pxe_config(
                 self.node['id'], 'alnum', iqn,
-                'aaaa', 'bbbb', 'cccc', 'dddd').AndReturn(pxe_config)
+                'aaaa', 'bbbb', 'cccc', 'dddd',
+                self.test_network_info).AndReturn(pxe_config)
         bm_utils.write_to_file(pxe_path, pxe_config)
         for mac in macs:
             bm_utils.create_link_without_raise(
@@ -466,7 +483,8 @@ class PXEPublicMethodsTestCase(BareMetalPXETestCase):
 
         self.mox.ReplayAll()
 
-        self.driver.activate_bootloader(self.context, self.node, self.instance)
+        self.driver.activate_bootloader(self.context, self.node, self.instance,
+                                        network_info=self.test_network_info)
 
         self.mox.VerifyAll()
 
@@ -515,8 +533,8 @@ class PXEPublicMethodsTestCase(BareMetalPXETestCase):
         row = db.bm_node_get(self.context, 1)
         self.assertTrue(row['deploy_key'] is None)
 
-        self.driver.activate_bootloader(self.context, self.node,
-                                            self.instance)
+        self.driver.activate_bootloader(self.context, self.node, self.instance,
+                                        network_info=self.test_network_info)
         row = db.bm_node_get(self.context, 1)
         self.assertTrue(row['deploy_key'] is not None)
 
diff --git a/nova/tests/virt/baremetal/test_tilera.py b/nova/tests/virt/baremetal/test_tilera.py
index 488cba4df..7ad5c4b6a 100755
--- a/nova/tests/virt/baremetal/test_tilera.py
+++ b/nova/tests/virt/baremetal/test_tilera.py
@@ -317,7 +317,8 @@ class TileraPublicMethodsTestCase(BareMetalTileraTestCase):
 
         self.mox.ReplayAll()
 
-        self.driver.activate_bootloader(self.context, self.node, self.instance)
+        self.driver.activate_bootloader(self.context, self.node, self.instance,
+                                        network_info=self.test_network_info)
 
         self.mox.VerifyAll()
 
@@ -334,8 +335,8 @@ class TileraPublicMethodsTestCase(BareMetalTileraTestCase):
         row = db.bm_node_get(self.context, 1)
         self.assertTrue(row['deploy_key'] is None)
 
-        self.driver.activate_bootloader(self.context, self.node,
-                                            self.instance)
+        self.driver.activate_bootloader(self.context, self.node, self.instance,
+                                        network_info=self.test_network_info)
         row = db.bm_node_get(self.context, 1)
         self.assertTrue(row['deploy_key'] is not None)