idem.py (salt-3002.1) | : | idem.py (salt-3002.2) | ||
---|---|---|---|---|
skipping to change at line 49 | skipping to change at line 49 | |||
sls_sources.append(implied) | sls_sources.append(implied) | |||
else: | else: | |||
SLSs.append(sls) | SLSs.append(sls) | |||
return sls_sources, SLSs | return sls_sources, SLSs | |||
def _get_low_data(low_data): | def _get_low_data(low_data): | |||
""" | """ | |||
Get salt-style low data from an idem state name | Get salt-style low data from an idem state name | |||
""" | """ | |||
# state_|-id_|-name_|-function | # state_|-id_|-name_|-function | |||
match = re.match(r"(\w+)_\|-(\w+)\|-(\w+)_\|-(\w+)", low_data) | match = re.match(r"(.+)_\|-(.+)_\|-(.+)_\|-(.+)", low_data) | |||
return { | return { | |||
"state": match.group(1), | "state": match.group(1), | |||
"__id__": match.group(2), | "__id__": match.group(2), | |||
"name": match.group(3), | "name": match.group(3), | |||
"fun": match.group(4), | "fun": match.group(4), | |||
} | } | |||
def state( | def state( | |||
name, | name, | |||
sls, | sls, | |||
skipping to change at line 101 | skipping to change at line 101 | |||
The render pipe to use, this allows for the language to be specified (ji nja|yaml) | The render pipe to use, this allows for the language to be specified (ji nja|yaml) | |||
runtime | runtime | |||
Select which execution runtime to use (serial|parallel) | Select which execution runtime to use (serial|parallel) | |||
source_dir | source_dir | |||
The directory containing sls files | The directory containing sls files | |||
.. code-block:: yaml | .. code-block:: yaml | |||
cheese: | cheese: | |||
idem.state: | idem.state: | |||
- runtime: parallel | - runtime: parallel | |||
- sls: | - sls: | |||
- idem_state.sls | - idem_state.sls | |||
- sls_source | - sls_source | |||
:maturity: new | :maturity: new | |||
:depends: acct, pop, pop-config, idem | :depends: acct, pop, pop-config, idem | |||
:platform: all | :platform: all | |||
""" | """ | |||
hub = __utils__["idem.hub"]() | hub = __utils__["idem.hub"]() | |||
if isinstance(sls, str): | if isinstance(sls, str): | |||
sls = [sls] | sls = [sls] | |||
End of changes. 2 change blocks. | ||||
7 lines changed or deleted | 7 lines changed or added |