diff options
| author |   Alexandru Avadanii <Alexandru.Avadanii@enea.com> | 2016-06-18 13:11:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-06-18 13:11:29 +0000 |
| commit | 9a87939874f234891c047958a4c8ec6e01b66254 (patch) | |
| tree | 7db88130dfb32e7f2764d9b11ee3e4228af2646c /patches | |
| parent | ed8f923065efc8251ca8faaf878f7c98c6cec6a1 (diff) | |
| parent | 12e6936eff4c466eceb290cb53eb6c0a606cb1f0 (diff) | |
Merge "Fix: reap.py: puppet-managed ifcfg files."
Diffstat (limited to 'patches')
| -rw-r--r-- | patches/opnfv-fuel/0008-deploy-reap.py-Dump-extra-interfaces-information.patch | 4 |
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() + |