cmueller/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #11113 from sysadmin75/11104_osx_facts_bridge

Browse source 
Fixes OSX fact gathering for the bridge interface.
This commit is contained in:
Brian Coca 2016-02-02 00:46:21 -05:00
commit a584ab3420
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
lib/ansible/module_utils/facts.py
View file

@ -2402,7 +2402,13 @@ class DarwinNetwork(GenericBsdIfconfigNetwork, Network):
current_if['media'] = 'Unknown' # Mac does not give us this current_if['media'] = 'Unknown' # Mac does not give us this
current_if['media_select'] = words[1] current_if['media_select'] = words[1]
if len(words) > 2: if len(words) > 2:
current_if['media_type'] = words[2][1:-1] # MacOSX sets the media to '<unknown type>' for bridge interface
# and parsing splits this into two words; this if/else helps
if words[1] == '<unknown' and words[2] == 'type>':
current_if['media_select'] = 'Unknown'
current_if['media_type'] = 'unknown type'
else:
current_if['media_type'] = words[2][1:-1]
if len(words) > 3: if len(words) > 3:
current_if['media_options'] = self.get_options(words[3]) current_if['media_options'] = self.get_options(words[3])