From: Peter Barabas <peter.barabas@ericsson.com>
Date: Tue, 26 Jan 2016 13:23:36 +0000 (+0100)
Subject: Fix boot parameters for Fuel 8
X-Git-Tag: brahmaputra.1.rc1~36
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;ds=sidebyside;h=refs%2Fchanges%2F29%2F8529%2F3;p=fuel.git

Fix boot parameters for Fuel 8

Change-Id: I21a70728810571482ca2cc2264733dbca89058d6
(cherry picked from commit 4214600456bf87ca339805407a904d229ad29dc6)
---

diff --git a/deploy/deploy.py b/deploy/deploy.py
index 7635cedba..393523bf9 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -161,10 +161,24 @@ class AutoDeploy(object):
         with io.open(file) as f:
             data = f.read()
         for key, val in self.fuel_conf.iteritems():
+            # skip replacing these keys, as the format is custom
+            if key in ['ip', 'gw', 'netmask', 'hostname']:
+                continue
+
             pattern = r'%s=[^ ]\S+' % key
             replace = '%s=%s' % (key, val)
             data = re.sub(pattern, replace, data)
 
+        # process networking parameters
+        ip = ':'.join([self.fuel_conf['ip'],
+                      '',
+                      self.fuel_conf['gw'],
+                      self.fuel_conf['netmask'],
+                      self.fuel_conf['hostname'],
+                      'eth0:off:::'])
+
+        data = re.sub(r'ip=[^ ]\S+', 'ip=%s' % ip, data)
+
         netmask = self.fuel_conf['netmask']
         data = self.append_kernel_param(data, 'netmask=%s' % netmask)