Commit Graph

74874 Commits

Author SHA1 Message Date
C. R. Oldham
6ea1f59058 Merge pull request #36929 from rallytime/fix-pending-upgrade-test
[yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades
2016-10-11 16:55:49 -06:00
rallytime
32829b9474 [yumpkg] Skip test_pkg_upgrade_has_pending_upgrades if there are no upgrades
yumpkg.list_upgrades returns an empty dictionary when no upgrades are available.
We need to check for this situation and skip the test if no upgrades are present.

Fixes the test failure on Fedora 24 on Jenkins currently, but also protects against
any potential failures for other RHEL-based distros that aren't currently failing
because "ret" is populated with a dictionary of upgrades.
2016-10-11 16:50:50 -06:00
Nicole Thomas
288f437d5e [2016.3] Remove "Targeting with Executions" section from docs (#36926)
The targeting docs were refactored in the 2016.3 branch compared to
the 2015.8 branch. This fixes #36906 for the 2016.3 branch and newer.

Refs #36925
2016-10-11 16:34:08 -06:00
Nicole Thomas
7838d8d3f9 Remove "Targeting with Executions" section from docs (#36925)
This feature was removed long ago and is no longer under development.

Fixes #36906
2016-10-11 16:33:56 -06:00
Erik Johnson
a56bf8bd2d Update references to future default value change that was reverted (#36924) 2016-10-11 16:33:41 -06:00
Erik Johnson
e5425f3e8c Revert change in default value for top_file_merging_strategy (#36922)
This causes problems when a Carbon master tries to run states on a
non-Carbon minion.
2016-10-11 16:33:23 -06:00
Olivier Mauras
de3d337fdd modules/apk.py: Ensure we don't error on version extraction (#36921) 2016-10-11 16:31:32 -06:00
Jacob Hammons
102f909bb4 Add FreeBSD and SmartOS to RC packages list (#36916) 2016-10-11 16:30:50 -06:00
Nicole Thomas
6516059d21 Merge pull request #36917 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-10-11 16:15:59 -06:00
rallytime
b196c9336a Merge branch '2016.3' into 'carbon'
No conflicts.
2016-10-11 13:54:09 -06:00
Jorge Schrauwen
f742e34555 smbios.get should handle missing /dev/mem to not have useless grains (#36909) 2016-10-11 13:50:56 -06:00
Nicole Thomas
b7f87e0aed Merge pull request #36915 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-10-11 13:49:42 -06:00
rallytime
971c27cba2 Merge branch '2015.8' into '2016.3'
No conflicts.
2016-10-11 13:00:17 -06:00
Erik Johnson
f3443fb992 Properly handle "shared" arg in git.init when it is a bool (#36912) 2016-10-11 12:54:15 -06:00
rallytime
b8ffd9f53f Allow alternatives.show_link function to work on Suse distros
This should fixup the failing integration.states.alternatives test
in 2016.3 as well. The alternatives.install state relies on checking
if the output of alternatives.show_link matches the path passed into
the state. Since show_link didn't work on suse correctly, the state
doesn't install the alternative and returns False.
2016-10-11 12:46:31 -06:00
Joseph Hall
17253d001f Pass through port as int and not str (#36910) 2016-10-11 12:45:53 -06:00
Joseph Hall
2e3fc1e3a8 Handle missing cache data a little more gracefully (#36908) 2016-10-11 12:41:28 -06:00
Daniel Wallace
727d4f309a allow for closing stuff in beacons
Like the filehandler for inotify
2016-10-11 12:34:42 -05:00
Thomas S Hatch
7e2eba9cc7 Merge pull request #36776 from cro/prox_min_mgr
Adapt MinionManager for Proxy Minions.
2016-10-11 11:12:01 -06:00
Jorge Schrauwen
8b9648cd97 [develop] salt.modules.at was hopelessly broken on Solaris-like platforms (#36873)
* disable current at module on solaris, only compute job_kw_regtex once

* provide at_solaris (virtual=at) for Solaris-like systems

* add proper maintainer header

* forgot to update the docs again

* add notice that at module only works on linux, openbsd, and freebsd

* salt.states.at needed a lot of love

* update at_state checks to pass valid date to at.at, at.jobcheck, at.atrm,...

* today I learn about mod_watch, and I want it for at
2016-10-11 10:33:40 -06:00
Tim Fechner
7547761acc Fix #36461, AttributeError because of .lower() (#36462)
* Fix #36461, AttributeError because of .lower()

* Add tests
2016-10-11 10:29:22 -06:00
Benoît Knecht
0ebf7a451c modules: debian_ip: override params early to fix diff (#36820)
Slave interfaces have some of their parameters overridden before being written
to file, but when Salt is ran in test mode, those overridden values aren't
taken into account. This results in the test run showing that changes will be
applied, even though the configuration hasn't changed at all:

        ID: ens2f1
  Function: network.managed
    Result: None
   Comment: Interface ens2f1 is set to be updated:
            ---
            +++
            @@ -1,4 +1,3 @@
             auto ens2f1
            -iface ens2f1 inet manual
            -    bond-master bond0
            +iface ens2f1 inet static
   Started: 09:07:41.719716
  Duration: 1.91 ms
   Changes:

This commit overrides those values in _parse_settings_eth instead of
_write_file_ifaces, so that the test run shows what's really going to be
modified.
2016-10-11 10:17:44 -06:00
Nicole Thomas
89c7286928 Add versionadded tag for new create_datacenter function (#36905) 2016-10-11 10:03:42 -06:00
Ilya Kogan
23322684d1 Merge branch 'develop' into highstate_returner 2016-10-11 11:37:28 -04:00
Justin Findlay
a23ce84e57 states.schedule: splay is not ordereddict (#36894) 2016-10-11 09:03:58 -06:00
Steeve
6654444fea [fix] pkg.installed call on pkg.install (#36904) 2016-10-11 08:55:53 -06:00
Alexandru Bleotu
6c441cb288 Create datacenter gh (#36826)
*  Added salt.utils.create_datacenter that creates a VMWare datacenter

* Added tests for salt.utils.vmware.create_datacenter
2016-10-11 08:49:53 -06:00
Vitaliy Fuks
50d51766e9 Typos are not fun! (#36901) 2016-10-11 08:45:15 -06:00
Ilya Kogan
ae5363f281 switched to print_function 2016-10-11 10:01:36 -04:00
Erik Johnson
bdbf1619cb Check for test=True in salt.wait_for_event orchestration events (#36897)
This prevents a wait_for_event from hanging the orchestration job when
test=True.
2016-10-10 17:00:42 -06:00
Steve Hajducko
7f3cf65036 Add future import statement 2016-10-10 15:23:01 -07:00
Seth House
6e4bf4cbe8 Add full SSE demo (#36878)
* Add proof-of-concept for consuming the SSE stream via JavaScript

* Add SSE demo app as default for the /app endpoint

* Switch SSE async warning with good async example and recommendations
2016-10-10 13:45:02 -06:00
Nicole Thomas
86ac8bd680 Merge pull request #36885 from rallytime/merge-2016.3
[2016.3] Merge forward from 2015.8 to 2016.3
2016-10-10 13:30:25 -06:00
Erik Johnson
cb92f8656a Fix traceback on "salt-ssh -h" (#36888)
This code was originally added to the option parser in 423a356. It was
probably intended to be a single string continued onto multiple lines
via parenthesis, but the use of a comma turns this into a tuple, which
causes a traceback when "salt-ssh -h" is run.
2016-10-10 13:30:05 -06:00
Michał Sochoń
ab206915dd Update tutorial.rst (#36892)
Fix error in the list.
2016-10-10 13:29:14 -06:00
Erik Johnson
1c0ba8012c salt-ssh: Try "command -v" before falling back to "which" (#36889)
This makes salt-ssh work better on minimal installs such as the CentOS 7
container images from linuxcontainers.org.
2016-10-10 13:28:41 -06:00
Nicole Thomas
33c3b8a6c3 Merge pull request #36883 from rallytime/merge-develop
[develop] Merge forward from carbon to develop
2016-10-10 11:39:14 -06:00
Jacob Hammons
dff93f89ff Update list of RC build platforms, fix example (#36887) 2016-10-10 11:36:48 -06:00
Ilya Kogan
0e579b42d2 Merge branch 'develop' into highstate_returner 2016-10-10 13:31:22 -04:00
Nicole Thomas
e2de78b130 Merge pull request #36884 from rallytime/merge-carbon
[carbon] Merge forward from 2016.3 to carbon
2016-10-10 11:22:23 -06:00
Sergey Kizunov
3d18b7aa46 Add 'resolve_dns_fallback' option to config
By default, the salt-minion will fall back to localhost (127.0.0.1) if
the DNS resolve fails on the salt-master hostname. There are some cases
where that is not desirable, such as when using a master failover list
and there is a master running locally that we don't want to connect to.

Add a boolean config option called `resolve_dns_fallback` which
defaults to True but will disable the fall back behavior if set to
False.

Now that `salt.minion.resolve_dns()` may be invoked with `fallback=False`,
that function is more likely to throw a `SaltClientError` exception
instead of reacting to the error condition internally. Due to this, made
sure the callers will be able to catch that exception and react
appropriately.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-10-10 12:11:14 -05:00
Nicole Thomas
e76f05ec48 Fix KeyError when loading runit execution module (#36882)
Fixes #36865
2016-10-10 10:59:35 -06:00
Nicole Thomas
3bb1bcc854 Merge pull request #36886 from rallytime/bp-36874
Back-port #36874 to carbon
2016-10-10 10:28:11 -06:00
m03
077645d054 Fix shell_info docstring example 2016-10-10 10:25:12 -06:00
rallytime
c09b9d6e6a Merge branch '2015.8' into '2016.3'
No conflicts.
2016-10-10 10:21:04 -06:00
rallytime
9ae34b2329 Merge branch '2016.3' into 'carbon'
Conflicts:
  - doc/topics/beacons/index.rst
2016-10-10 10:19:50 -06:00
rallytime
d07f5612ee Merge branch 'carbon' into 'develop'
No conflicts.
2016-10-10 10:18:02 -06:00
Moe
f528b9f292 Fix shell_info docstring example (#36874) 2016-10-10 09:58:18 -06:00
Ilya Kogan
d2e5d11d22 Merge branch 'develop' into highstate_returner 2016-10-10 10:18:11 -04:00
Ilya Kogan
30b802874e Added more debug log 2016-10-09 20:30:04 -04:00