valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #43341 from ixs/fedora-rh_ip

Browse Source 
Fix rh_ip template use for Fedora
This commit is contained in:
Mike Place 2017-09-11 10:30:53 -06:00 committed by GitHub
commit 2964707e5d
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
salt/modules/rh_ip.py
View File

@ -1013,7 +1013,10 @@ def build_interface(iface, iface_type, enabled, **settings):
salt '*' ip.build_interface eth0 eth <settings>
'''
if __grains__['os'] == 'Fedora':
rh_major = '6'
if __grains__['osmajorrelease'] >= 18:
rh_major = '7'
else:
rh_major = '6'
else:
rh_major = __grains__['osrelease'][:1]

2
tests/unit/modules/test_rh_ip.py
View File

@ -58,7 +58,7 @@ class RhipTestCase(TestCase, LoaderModuleMockMixin):
'''
Test to build an interface script for a network interface.
'''
with patch.dict(rh_ip.__grains__, {'os': 'Fedora'}):
with patch.dict(rh_ip.__grains__, {'os': 'Fedora', 'osmajorrelease': 26}):
with patch.object(rh_ip, '_raise_error_iface', return_value=None):
self.assertRaises(AttributeError,