Merge pull request #5012 from UtahDave/add_ip4_win

Add ip4 grain for Windows.

salt/grains/core.py

@@ -834,11 +834,7 @@ def ip4():
     Return a list of ipv4 addrs
     '''
     ips = []
-    if salt.utils.is_windows():
-        # TODO: Add windows ip addrs here
-        pass
-    else:
-        ips = salt.utils.socket_util.ip4_addrs()
+    ips = salt.utils.socket_util.ip4_addrs()
     return {'ipv4': ips}
 
 

salt/utils/socket_util.py

@@ -276,6 +276,11 @@ def interfaces():
     '''
     Return a dictionary of information about all the interfaces on the minion
     '''
+    if salt.utils.is_windows():
+        from salt.modules.win_network import interfaces as win_interfaces
+        ifaces = win_interfaces()
+        return ifaces
+
     ifaces = dict()
     if salt.utils.which('ip'):
         cmd1 = subprocess.Popen(