community/salt: Update to 2016.3.4

1 files changed, 26 insertions, 20 deletions

diff --git a/community/salt/0001-alpine-support.patch b/community/salt/0001-alpine-support.patch
index 01caefea00..530d33f391 100644
--- a/community/salt/0001-alpine-support.patch
+++ b/community/salt/0001-alpine-support.patch
@@ -1,4 +1,5 @@
-Upstream code not yet released
+Upstream code not released yet that will happen in next major version
+
 ---
 diff --git a/salt/modules/apk.py b/salt/modules/apk.py
 new file mode 100644
@@ -626,17 +627,18 @@ index 0000000..4c0efe0
 +
 +    return ret
 diff --git a/salt/modules/gentoo_service.py b/salt/modules/gentoo_service.py
-index 92cf48a..32dfcde 100644
+index 228a3fe..32dfcde 100644
 --- a/salt/modules/gentoo_service.py
 +++ b/salt/modules/gentoo_service.py
-@@ -12,6 +12,14 @@ to the correct service manager
+@@ -12,9 +12,14 @@ to the correct service manager
  
  # Import Python libs
  from __future__ import absolute_import
 +import logging
-+
+ 
+-# Import Salt modules
 +# Import salt libs
-+import salt.utils.systemd
+ import salt.utils.systemd
 +import salt.utils.odict as odict
 +
 +# Set up logging
@@ -644,14 +646,15 @@ index 92cf48a..32dfcde 100644
  
  # Define the module's virtual name
  __virtualname__ = 'service'
-@@ -19,12 +27,65 @@ __virtualname__ = 'service'
+@@ -22,13 +27,65 @@ __virtualname__ = 'service'
  
  def __virtual__():
      '''
 -    Only work on systems which default to systemd
 +    Only work on systems which default to OpenRC
      '''
--    if __grains__['os'] == 'Gentoo':
+-    if __grains__['os'] == 'Gentoo' \
+-            and not salt.utils.systemd.booted(__context__):
 +    if __grains__['os'] == 'Gentoo' and not salt.utils.systemd.booted(__context__):
 +        return __virtualname__
 +    if __grains__['os'] == 'Alpine':
@@ -713,7 +716,7 @@ index 92cf48a..32dfcde 100644
  
  
  def get_enabled():
-@@ -37,15 +98,8 @@ def get_enabled():
+@@ -41,15 +98,8 @@ def get_enabled():
  
          salt '*' service.get_enabled
      '''
@@ -731,7 +734,7 @@ index 92cf48a..32dfcde 100644
  
  
  def get_disabled():
-@@ -58,17 +112,9 @@ def get_disabled():
+@@ -62,17 +112,9 @@ def get_disabled():
  
          salt '*' service.get_disabled
      '''
@@ -752,7 +755,7 @@ index 92cf48a..32dfcde 100644
  
  
  def available(name):
-@@ -82,7 +128,9 @@ def available(name):
+@@ -86,7 +128,9 @@ def available(name):
  
          salt '*' service.available sshd
      '''
@@ -763,7 +766,7 @@ index 92cf48a..32dfcde 100644
  
  
  def missing(name):
-@@ -97,7 +145,7 @@ def missing(name):
+@@ -101,7 +145,7 @@ def missing(name):
  
          salt '*' service.missing sshd
      '''
@@ -772,7 +775,7 @@ index 92cf48a..32dfcde 100644
  
  
  def get_all():
-@@ -110,7 +158,10 @@ def get_all():
+@@ -114,7 +158,10 @@ def get_all():
  
          salt '*' service.get_all
      '''
@@ -784,7 +787,7 @@ index 92cf48a..32dfcde 100644
  
  
  def start(name):
-@@ -123,8 +174,8 @@ def start(name):
+@@ -127,8 +174,8 @@ def start(name):
  
          salt '*' service.start <service name>
      '''
@@ -795,7 +798,7 @@ index 92cf48a..32dfcde 100644
  
  
  def stop(name):
-@@ -137,8 +188,8 @@ def stop(name):
+@@ -141,8 +188,8 @@ def stop(name):
  
          salt '*' service.stop <service name>
      '''
@@ -806,7 +809,7 @@ index 92cf48a..32dfcde 100644
  
  
  def restart(name):
-@@ -151,8 +202,36 @@ def restart(name):
+@@ -155,8 +202,36 @@ def restart(name):
  
          salt '*' service.restart <service name>
      '''
@@ -845,7 +848,7 @@ index 92cf48a..32dfcde 100644
  
  
  def status(name, sig=None):
-@@ -167,7 +246,10 @@ def status(name, sig=None):
+@@ -171,7 +246,10 @@ def status(name, sig=None):
  
          salt '*' service.status <service name> [service signature]
      '''
@@ -857,7 +860,7 @@ index 92cf48a..32dfcde 100644
  
  
  def enable(name, **kwargs):
-@@ -178,10 +260,26 @@ def enable(name, **kwargs):
+@@ -182,10 +260,26 @@ def enable(name, **kwargs):
  
      .. code-block:: bash
  
@@ -887,7 +890,7 @@ index 92cf48a..32dfcde 100644
  
  
  def disable(name, **kwargs):
-@@ -192,10 +290,18 @@ def disable(name, **kwargs):
+@@ -196,10 +290,18 @@ def disable(name, **kwargs):
  
      .. code-block:: bash
  
@@ -909,7 +912,7 @@ index 92cf48a..32dfcde 100644
  
  
  def enabled(name, **kwargs):
-@@ -206,9 +312,17 @@ def enabled(name, **kwargs):
+@@ -210,9 +312,17 @@ def enabled(name, **kwargs):
  
      .. code-block:: bash
  
@@ -929,7 +932,7 @@ index 92cf48a..32dfcde 100644
  
  
  def disabled(name):
-@@ -219,6 +333,6 @@ def disabled(name):
+@@ -223,6 +333,6 @@ def disabled(name):
  
      .. code-block:: bash
  
@@ -937,3 +940,6 @@ index 92cf48a..32dfcde 100644
 +        salt '*' service.disabled <service name> <runlevels=[runlevel]>
      '''
      return name in get_disabled()
+-- 
+2.10.0
+