Because we check in the master opts first, if the environment or
pillarenv values are set in the master config file, they will take
precedence over the values specified in the minion config (or gathered
via the CLI). This commit fixes that ordering such that the values
passed to __gen_opts() take precedence over the values from the master
config.
Version 2.6.0 changed the wording of one of the exceptions tested,
causing tests to fail when jsonschema 2.6.0 is installed. This commit
updates the tests to change the assert for 2.6.0 and later.
This reverses the decision made in #35055 to deprecate the "enabled"
parameter in this state. This was a poorly-conceived decision, likely
made because the "enabled" param was not included in the docstring for
the pkgrepo.managed state under the "YUM/ZYPPER" section, while the
"disabled" param *was* listed under the "APT" section.
"disabled" isn't a thing in yum/dnf, so there was never any reason to
try to shoehorn it in. Not to mention the fact that the "disabled"
argument isn't even supported in Zypper, which effectively breaks Zypper
support.
This commit normalizes enabled/disabled based on platform, so passing
"enabled" in APT will pass the opposite value as "disabled", and
vice-versa on the other platforms. This allows enabled/disabled to be
used interchangeably.
It also more gracefully handles booleans in yum/dnf/zypper, so that a
bool can be properly compared to a 1/0 value.
The changes made in #38793 changes the "get_all_ointerfaces" call
to be a list of DNS servers. This change adjusts the tests structure
from a string to a list and fixes the test failure.
There are two modules on PyPI which import as "jenkins". Installing the
wrong one will result in a traceback when the execution module tries to
use the Python bindings. This commit adds information about the
dependency to the docstring for the module. It also checks to make sure
that jenkins.Jenkins is present in the __virtual__() func, and if not it
will fail to load the execution module with a meaningful error message
in the log.
* Apply fix from #38705 to 2016.3 branch
This is a better fix and covers more use cases than the sudo_user one.
* Remove saltenv param from internal state func call
This was probably redundant in the first place, but since state.sls,
state.highstate, etc. accept a saltenv param and the actual state
functions do not, this results in multiple values passed for the saltenv
param.
Remove this argument and let file.get_managed reference __env__
internally.
* Update archive tests to match 2016.11 branch
The IDE entry needs to be a dictionary entry. Without this, it is seen
as a string. This is probably done this way so that in the future,
configurations can be added to the IDE device.
