valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26458 from arthurlogilab/minion_proxy_fixes

Browse Source 
[minionproxy] example modules fixes
This commit is contained in:
Mike Place 2015-08-19 16:49:49 -06:00
commit 0cf9f11aa5
2 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
salt/modules/rest_package.py
View File

@ -55,7 +55,7 @@ def version(*names, **kwargs):
salt '*' pkg.version <package1> <package2> <package3> ... salt '*' pkg.version <package1> <package2> <package3> ...
''' '''
if len(names) == 1: if len(names) == 1:
return str(__opts__['proxymodule']['rest_sample.package_status'](names)) return str(__opts__['proxymodule']['rest_sample.package_status'](names[0]))
def installed( def installed(

21
salt/modules/rest_service.py
View File

@ -26,6 +26,7 @@ def __virtual__():
# Enable on these platforms only. # Enable on these platforms only.
enable = set(( enable = set((
'RestExampleOS', 'RestExampleOS',
'proxy',
)) ))
if __grains__['os'] in enable: if __grains__['os'] in enable:
return __virtualname__ return __virtualname__
@ -40,9 +41,9 @@ def start(name):
.. code-block:: bash .. code-block:: bash
salt '*' rest_service.start <service name> salt '*' service.start <service name>
''' '''
return __opts__['proxyobject'].service_start(name) return __opts__['proxymodule']['rest_sample.service_start'](name)
def stop(name): def stop(name):
@ -53,9 +54,9 @@ def stop(name):
.. code-block:: bash .. code-block:: bash
salt '*' rest_service.stop <service name> salt '*' service.stop <service name>
''' '''
return __opts__['proxyobject'].service_stop(name) return __opts__['proxymodule']['rest_sample.service_stop'](name)
def restart(name): def restart(name):
@ -66,10 +67,10 @@ def restart(name):
.. code-block:: bash .. code-block:: bash
salt '*' rest_service.restart <service name> salt '*' service.restart <service name>
''' '''
return __opts__['proxyobject'].service_restart(name) return __opts__['proxymodule']['rest_sample.service_restart'](name)
def status(name): def status(name):
@ -81,9 +82,9 @@ def status(name):
.. code-block:: bash .. code-block:: bash
salt '*' rest_service.status <service name> salt '*' service.status <service name>
''' '''
return __opts__['proxyobject'].service_status(name) return __opts__['proxymodule']['rest_sample.service_status'](name)
def list_(): def list_():
@ -94,6 +95,6 @@ def list_():
.. code-block:: bash .. code-block:: bash
salt '*' rest_service.list <service name> salt '*' service.list <service name>
''' '''
return __opts__['proxyobject'].service_list() return __opts__['proxymodule']['rest_sample.service_list']()