mirror of
https://github.com/saltstack/salt.git
synced 2025-04-17 10:10:20 +00:00
Fix more sphinx build errors
This commit is contained in:
Erik Johnson
parent
18a8104aae
commit
9272f7b735
4 changed files with 33 additions and 33 deletions
|
|
@ -507,7 +507,7 @@ Changelog for v2018.3.2..v2018.3.3
|
|||
|
||||
* 3d26affa10 Fix remaining file state integration tests (py3)
|
||||
|
||||
* **PR** `#49171`_: (`Ch3LL`_) [2018.3.3] cherry pick `#49103`_
|
||||
* **PR** `#49171`_: (`Ch3LL`_) [2018.3.3] cherry pick `#49103`_
|
||||
@ *2018-08-17 20:23:32 UTC*
|
||||
|
||||
* **PR** `#49103`_: (`dwoz`_) Install the launcher so we can execute py files (refs: `#49171`_)
|
||||
|
|
@ -1630,7 +1630,7 @@ Changelog for v2018.3.2..v2018.3.3
|
|||
|
||||
* **ISSUE** `#46896`_: (`Poil`_) Proxy + file.managed => Comment: Failed to cache xxx invalid arguments to setopt (refs: `#48754`_)
|
||||
|
||||
* **PR** `#48754`_: (`lomeroe`_) send proxy/ca_cert parameters as strings (not unicode) to tornado httpclient
|
||||
* **PR** `#48754`_: (`lomeroe`_) send proxy/ca_cert parameters as strings (not unicode) to tornado httpclient
|
||||
@ *2018-07-25 14:55:42 UTC*
|
||||
|
||||
* 030c921914 Merge pull request `#48754`_ from lomeroe/fix-tornado-proxy
|
||||
|
|
@ -3075,7 +3075,7 @@ Changelog for v2018.3.2..v2018.3.3
|
|||
|
||||
* dae65da256 Merge branch '2018.3.1' into '2018.3'
|
||||
|
||||
* **PR** `#48186`_: (`rallytime`_) Add autodoc module for saltcheck.py
|
||||
* **PR** `#48186`_: (`rallytime`_) Add autodoc module for saltcheck.py
|
||||
@ *2018-06-19 19:03:55 UTC*
|
||||
|
||||
* 5b4897f050 Merge pull request `#48186`_ from rallytime/saltcheck-docs
|
||||
|
|
@ -3362,11 +3362,11 @@ Changelog for v2018.3.2..v2018.3.3
|
|||
* **PR** `#48109`_: (`rallytime`_) Back-port `#47851`_ to 2018.3
|
||||
@ *2018-06-14 13:09:04 UTC*
|
||||
|
||||
* **PR** `#47851`_: (`rares-pop`_) Fixup! add master.py:FileserverUpdate **kwargs (refs: `#48109`_)
|
||||
* **PR** `#47851`_: (`rares-pop`_) Fixup! add master.py:FileserverUpdate \*\*kwargs (refs: `#48109`_)
|
||||
|
||||
* 2902ee0b14 Merge pull request `#48109`_ from rallytime/bp-47851
|
||||
|
||||
* e9dc30bf8e Fixup! add master.py:FileserverUpdate **kwargs
|
||||
* e9dc30bf8e Fixup! add master.py:FileserverUpdate \*\*kwargs
|
||||
|
||||
* **ISSUE** `#47925`_: (`JonGriggs`_) GitFS looking for files in the master branch only (refs: `#47943`_)
|
||||
|
||||
|
|
@ -3377,7 +3377,7 @@ Changelog for v2018.3.2..v2018.3.3
|
|||
|
||||
* 534e1a7100 Merge branch '2018.3' into issue47925
|
||||
|
||||
* **PR** `#48089`_: (`rallytime`_) Update release versions for the 2018.3 branch
|
||||
* **PR** `#48089`_: (`rallytime`_) Update release versions for the 2018.3 branch
|
||||
@ *2018-06-13 14:03:44 UTC*
|
||||
|
||||
* 9e1d0040e4 Merge pull request `#48089`_ from rallytime/update_version_doc_2018.3
|
||||
|
|
|
|||
|
|
@ -29,19 +29,20 @@ def __virtual__():
|
|||
|
||||
def ext_pillar(minion_id, pillar, *args, **kwargs):
|
||||
'''
|
||||
Node definitions path will be retrieved from args - or set to default -
|
||||
then added to 'salt_data' dict that is passed to the 'get_pillars' function.
|
||||
'salt_data' dict is a convenient way to pass all the required datas to the function
|
||||
It contains:
|
||||
- __opts__
|
||||
- __salt__
|
||||
- __grains__
|
||||
- __pillar__
|
||||
- minion_id
|
||||
- path
|
||||
|
||||
If successfull the function will return a pillar dict for minion_id
|
||||
Compile pillar data
|
||||
'''
|
||||
# Node definitions path will be retrieved from args (or set to default),
|
||||
# then added to 'salt_data' dict that is passed to the 'get_pillars'
|
||||
# function. The dictionary contains:
|
||||
# - __opts__
|
||||
# - __salt__
|
||||
# - __grains__
|
||||
# - __pillar__
|
||||
# - minion_id
|
||||
# - path
|
||||
#
|
||||
# If successful, the function will return a pillar dict for minion_id.
|
||||
|
||||
# If path has not been set, make a default
|
||||
for i in args:
|
||||
if 'path' not in i:
|
||||
|
|
|
|||
|
|
@ -16,8 +16,6 @@
|
|||
# limitations under the License.
|
||||
|
||||
r'''
|
||||
:codeauthor: :email:`Bo Maryniuk <bo@suse.de>`
|
||||
|
||||
Execution of Ansible modules from within states
|
||||
===============================================
|
||||
|
||||
|
|
|
|||
|
|
@ -108,7 +108,7 @@ Saltclass Examples
|
|||
|
||||
``<saltclass_path>/nodes/lausanne/qls.node1.yml``
|
||||
|
||||
.. code-block:: yaml
|
||||
.. code-block:: jinja
|
||||
|
||||
environment: base
|
||||
|
||||
|
|
@ -228,19 +228,20 @@ def __virtual__():
|
|||
|
||||
def top(**kwargs):
|
||||
'''
|
||||
Node definitions path will be retrieved from __opts__ - or set to default -
|
||||
then added to 'salt_data' dict that is passed to the 'get_tops' function.
|
||||
'salt_data' dict is a convenient way to pass all the required datas to the function
|
||||
It contains:
|
||||
- __opts__
|
||||
- empty __salt__
|
||||
- __grains__
|
||||
- empty __pillar__
|
||||
- minion_id
|
||||
- path
|
||||
|
||||
If successfull the function will return a top dict for minion_id
|
||||
Compile tops
|
||||
'''
|
||||
# Node definitions path will be retrieved from args (or set to default),
|
||||
# then added to 'salt_data' dict that is passed to the 'get_pillars'
|
||||
# function. The dictionary contains:
|
||||
# - __opts__
|
||||
# - __salt__
|
||||
# - __grains__
|
||||
# - __pillar__
|
||||
# - minion_id
|
||||
# - path
|
||||
#
|
||||
# If successful, the function will return a pillar dict for minion_id.
|
||||
|
||||
# If path has not been set, make a default
|
||||
_opts = __opts__['master_tops']['saltclass']
|
||||
if 'path' not in _opts:
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue