aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPeter Barabas <peter.barabas@ericsson.com>2016-02-04 11:14:09 +0100
committerPeter Barabas <peter.barabas@ericsson.com>2016-02-04 11:14:09 +0100
commit62920f0ea95baf657f640d9f8f5c4f99ff8abf5e (patch)
treec91bf119001f9193c792a29f0c602c6408293be0
parent6998c454dbf4f97bbbdd49948be87123a7f70078 (diff)
Remove patching 'netmask' from isolinux.cfg
Change-Id: I7ba0c677b8a77b1239fcec4d0771af2b2cdddc01 Signed-off-by: Peter Barabas <peter.barabas@ericsson.com>
-rwxr-xr-xdeploy/deploy.py25
1 files changed, 3 insertions, 22 deletions
diff --git a/deploy/deploy.py b/deploy/deploy.py
index 393523bf9..96cf14f26 100755
--- a/deploy/deploy.py
+++ b/deploy/deploy.py
@@ -142,10 +142,10 @@ class AutoDeploy(object):
delete('.rr_moved')
isolinux = 'isolinux/isolinux.cfg'
log('isolinux.cfg before: %s'
- % exec_cmd('grep netmask %s' % isolinux))
+ % exec_cmd('grep ip= %s' % isolinux))
self.update_fuel_isolinux(isolinux)
log('isolinux.cfg after: %s'
- % exec_cmd('grep netmask %s' % isolinux))
+ % exec_cmd('grep ip= %s' % isolinux))
iso_label = self.parse_iso_volume_label(self.iso_file)
log('Volume label: %s' % iso_label)
@@ -161,7 +161,7 @@ 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
+ # skip replacing these keys, as the format is different
if key in ['ip', 'gw', 'netmask', 'hostname']:
continue
@@ -179,28 +179,9 @@ class AutoDeploy(object):
data = re.sub(r'ip=[^ ]\S+', 'ip=%s' % ip, data)
- netmask = self.fuel_conf['netmask']
- data = self.append_kernel_param(data, 'netmask=%s' % netmask)
-
with io.open(file, 'w') as f:
f.write(data)
- def append_kernel_param(self, data, kernel_param):
- """Append the specified kernel parameter to a list of kernel
- parameters. Do it only if it isn't already there.
- """
- data_final = ''
- key = re.match(r'(.+?=)', kernel_param).group()
-
- for line in data.splitlines():
- data_final += line
- if (re.search(r'append ', line) and
- not re.search(key, line)):
- data_final += ' ' + kernel_param
- data_final += '\n'
-
- return data_final
-
def parse_iso_volume_label(self, iso_filename):
label_line = exec_cmd('isoinfo -d -i %s | grep -i "Volume id: "' % iso_filename)
# cut leading text: 'Volume id: '