summaryrefslogtreecommitdiffstats
path: root/patches/opnfv-fuel
diff options
context:
space:
mode:
authorAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-17 19:58:13 +0200
committerAlexandru Avadanii <Alexandru.Avadanii@enea.com>2016-06-17 19:58:44 +0200
commit12e6936eff4c466eceb290cb53eb6c0a606cb1f0 (patch)
tree9deb3bea243ce068e25fd9abdae73dce5de478b0 /patches/opnfv-fuel
parentfb356f4606884ec608116e2cc9f4d9ac1eeebdda (diff)
Fix: reap.py: puppet-managed ifcfg files.
Skip parsing comment lines in ifcfg-ethX files at reap, e.g.: Change-Id: Ide6b2111619f7558f1434fda5cd254b842cef0ae Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Diffstat (limited to 'patches/opnfv-fuel')
-rw-r--r--patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch4
1 files changed, 3 insertions, 1 deletions
diff --git a/patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch b/patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch
index 7cb759e1..9ed79cc4 100644
--- a/patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch
+++ b/patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch
@@ -51,7 +51,7 @@ index ed5bc99..9f14e35 100644
from common import (
N,
-@@ -248,6 +250,38 @@ class Reap(object):
+@@ -248,6 +250,40 @@ class Reap(object):
if key not in ['ipaddress', 'netmask',
'dhcp_pool_start', 'dhcp_pool_end', 'ssh_network']:
del fuel['ADMIN_NETWORK'][key]
@@ -78,6 +78,8 @@ index ed5bc99..9f14e35 100644
+ ifcfg_f = ('/etc/sysconfig/network-scripts/ifcfg-%s' % ifcfg_name)
+ with open(ifcfg_f) as f:
+ for line in f:
++ if line.startswith('#'):
++ continue
+ (key, val) = line.split('=')
+ ifcfg_data[key.lower()] = val.rstrip()
+