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

Recognize pkgin when installed in the global zone on SmartOS

Browse source
This commit is contained in:
Jasper Lievisse Adriaanse 2016-12-25 13:43:29 +01:00 committed by Brian Coca
parent b9e4a4dede
commit 0c0defb63d
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -145,6 +145,7 @@ class Facts(object):
{ 'path' : '/bin/opkg', 'name' : 'opkg' }, { 'path' : '/bin/opkg', 'name' : 'opkg' },
{ 'path' : '/usr/pkg/bin/pkgin', 'name' : 'pkgin' }, { 'path' : '/usr/pkg/bin/pkgin', 'name' : 'pkgin' },
{ 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' }, { 'path' : '/opt/local/bin/pkgin', 'name' : 'pkgin' },
{ 'path' : '/opt/tools/bin/pkgin', 'name' : 'pkgin' },
{ 'path' : '/opt/local/bin/port', 'name' : 'macports' }, { 'path' : '/opt/local/bin/port', 'name' : 'macports' },
{ 'path' : '/usr/local/bin/brew', 'name' : 'homebrew' }, { 'path' : '/usr/local/bin/brew', 'name' : 'homebrew' },
{ 'path' : '/sbin/apk', 'name' : 'apk' }, { 'path' : '/sbin/apk', 'name' : 'apk' },
@ -2247,7 +2248,7 @@ class Darwin(Hardware):
class HurdHardware(LinuxHardware): class HurdHardware(LinuxHardware):
""" """
GNU Hurd specific subclass of Hardware. Define memory and mount facts GNU Hurd specific subclass of Hardware. Define memory and mount facts
based on procfs compatibility translator mimicking the interface of based on procfs compatibility translator mimicking the interface of
the Linux kernel. the Linux kernel.
""" """
@ -3016,7 +3017,7 @@ class NetBSDNetwork(GenericBsdIfconfigNetwork):
""" """
platform = 'NetBSD' platform = 'NetBSD'
def parse_media_line(self, words, current_if, ips): def parse_media_line(self, words, current_if, ips):
# example of line: # example of line:
# $ ifconfig # $ ifconfig
# ne0: flags=8863<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST> mtu 1500 # ne0: flags=8863<UP,BROADCAST,NOTRAILERS,RUNNING,SIMPLEX,MULTICAST> mtu 1500