Commit Graph

64740 Commits

Author SHA1 Message Date
Bo Maryniuk
4d7659270e Place the boolean check 2016-01-21 17:55:18 +01:00
Bo Maryniuk
58db1c3b16 Fix typo 2016-01-21 17:50:14 +01:00
Mike Place
c341e20801 Merge pull request #30495 from sjorge/pkgin-docs
tiny doc fix for salt.modules.pkgin
2016-01-21 09:37:40 -07:00
Pedro Algarvio
111595d582 Revert "Keep old opts "behavior" and be explicit on which options dict is used"
This reverts commit b06aa1e335.
2016-01-21 16:36:52 +00:00
Mike Place
3f280991a3 Merge pull request #30408 from twangboy/mac_timezone
Mac timezone module
2016-01-21 09:36:29 -07:00
Thomas Jackson
e1dea6f843 Properly remove newlines after reading the file
This means if there are additional newline characters in the config (which have no meaning for ifcfg) then we won't see it as a diff
2016-01-21 08:16:28 -08:00
Mike Place
a9348dfef8 Merge pull request #30478 from jtand/pip_8_update
Updated pip_state to work with pip 8.0
2016-01-21 09:02:41 -07:00
Erik Johnson
330e26d1da Hide get_locked_packages 2016-01-21 09:56:13 -06:00
Erik Johnson
5a637420e8 Backport DNF support to 2015.5 branch
This will allow 2015.5 releases to operate successfully on Fedora 22 and
newer.
2016-01-21 09:56:13 -06:00
Mike Place
c1c575b58c Merge pull request #30479 from sjorge/smartos-grains
fix incorrect smartos grains
2016-01-21 08:56:02 -07:00
Mike Place
119f025073 Merge pull request #30483 from borgstrom/pyobjects_recursive-2015.8
Pyobjects recursive import support (for 2015.8)
2016-01-21 08:55:27 -07:00
Mike Place
a30147c64f Merge pull request #30482 from borgstrom/pyobjects_recursive
Pyobjects recursive import support (for 2015.5)
2016-01-21 08:54:32 -07:00
Mike Place
f61c218a8a Merge pull request #30481 from basepi/yaml_safe_dump_filter.30454
Add yaml_safe jinja filter
2016-01-21 08:53:39 -07:00
Mike Place
d8d19cf75d Merge pull request #30491 from jacksontj/2015.8
Add multi-IP support to network state
2016-01-21 08:51:42 -07:00
Mike Place
56332ca504 Merge pull request #30496 from alprs/fix-ignored_pillars_keyerror
Fix KeyError when adding ignored pillars
2016-01-21 08:51:03 -07:00
Mike Place
491610b998 Merge pull request #30488 from skizunov/develop2
Do not use '__master_alive' schedule on TCP transport
2016-01-21 08:43:10 -07:00
Mike Place
740e930b5b Merge pull request #30499 from midihenry/patch-1
Typo in comments for module_report() function
2016-01-21 08:40:09 -07:00
Mike Place
179f1c51b4 Merge pull request #30471 from ustolt/develop
smtp_return: an empty optional config value "smtp.renderer" leads to …
2016-01-21 08:39:30 -07:00
Pedro Algarvio
b06aa1e335 Keep old opts "behavior" and be explicit on which options dict is used 2016-01-21 14:33:23 +00:00
Pedro Algarvio
7ffb4e5dad Pass the "minion_opts" where needed. 2016-01-21 14:33:23 +00:00
Pedro Algarvio
6320bc38fd Be explicit to which id we're referring to. Actually pass the minion ID. 2016-01-21 14:33:23 +00:00
Pedro Algarvio
bf7ce7c098 Stop the deprecation path started in 0.17 about ext_pillar
The ``ext_pillar`` functions **must** now accept a minion ID as the first argument.
This stops the deprecation path started in Salt 0.17.x. Before this minion ID first argument was introduced, the minion ID could be retrieved accessing ``__opts__['id']`` loosing the reference to the master ID initially set in opts.
This is no longer the case, ``__opts__['id']`` will be kept as the master ID.
2016-01-21 14:33:23 +00:00
midihenry
5267b804e7 Typo exeution -> execution 2016-01-21 11:18:49 +01:00
Jorge Schrauwen
3e1ed5676e tiny doc fix 2016-01-21 08:11:32 +00:00
Andreas Lutro
bbcb783621 fix KeyError when adding ignored pillars 2016-01-21 09:11:04 +01:00
Bo Maryniuk
43254aa993 Update docstring according to the boolean flag 2016-01-21 08:49:16 +01:00
Bo Maryniuk
a7d3e0d5ad Change 'errors' flag to boolean. 2016-01-21 08:48:08 +01:00
Thomas Jackson
82213555ca Normalize yaml spacing to 2 space 2016-01-20 18:29:03 -08:00
Thomas Jackson
3d1469b8d9 Add example of multiple addrs/ipv6addrs to docs 2016-01-20 18:29:03 -08:00
Thomas Jackson
91c8a1b4e4 Add support for multiple IP addresses per interface to rh_ip 2016-01-20 18:29:03 -08:00
Mike Place
8ec28e8563 Merge pull request #30469 from jacobhammons/doc-updates
Fixed sphinx build warnings / errors, added autodoc entries for new m…
2016-01-20 18:00:30 -07:00
rallytime
1d7e229377 Fix Linode driver cloning functionality.
Fixes #30432
Fixes #30444

- Various clean-up of the driver, particularly in the create function.
- Restores cloning functionality, as this was completely broken in 2015.8.3
- Changes the requirement to set a config_id for cloned VMs (not necessary
for clones as the config_id is already set via the to-be-cloned profile)
- Updates docs to use the -F bootstrap script arg in addition to -C when
cloning from a VM that already has salt installed on it.
2016-01-20 17:05:20 -07:00
Sergey Kizunov
d721681a5e Do not use '__master_alive' schedule on TCP transport
salt/minion.py
- Do not schedule `__master_alive` on TCP transport. This will
avoid invoking `status.master` on a recurring basis.
- When handling `__master_disconnected` event, there was an extra
unnecessary unpack that was causing an exception. Fixed.

salt/transport/tcp.py
- In `SaltMessageClient`, added a mechanism for both connect and
disconnect callbacks which are optional.
- In `AsyncTCPPubChannel` used the connect and disconnect callbacks
from `SaltMessageClient` to send local events `__master_connected`
and `__master_disconnected` respectively. This obsoletes the need for
scheduling `__master_alive`.
- In `AsyncTCPPubChannel`, on a reconnect (not the first connect),
it will send a `minion_start` / `syndic_start` master event. This is
necessary to inform the master of the reconnect so that a reactor may
take action in case there was an IP address change between the connects.
If there was an IP address change, the presence-change based features will
not work correctly due to the grains containing the old ip address. One
way to force an IP address change is to switch ethernet ports on a
multi-NIC minion. This is also useful if the salt-master restarts (but
not the salt-minion), the restarted salt-master will now get the event.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
2016-01-20 17:47:57 -06:00
Evan Borgstrom
2c55a7580b Fixup lint errors 2016-01-20 15:29:30 -08:00
Evan Borgstrom
788b672e3a Fixup lint errors 2016-01-20 15:28:48 -08:00
Jorge Schrauwen
8a9f0f6102 role -> roles and should support multiple roles 2016-01-20 22:12:21 +00:00
justinta89
9cb17332fa Updated pip_state to work with pip 8.0 on 2015.8 2016-01-20 14:43:50 -07:00
Jorge Schrauwen
3ffd3f0688 turn : and - into _ for grain name 2016-01-20 21:12:55 +00:00
Evan Borgstrom
e148ea2d52 Allow recursive salt:// imports
Fixes #30465
2016-01-20 11:29:00 -08:00
Evan Borgstrom
6bbac64d3a Add test to prove that recursive imports are currently broken
Refs #30465

This also exposes some other issues with the Registry being in an
inconsistent state when an exception occurs when we are rendering.
2016-01-20 11:22:51 -08:00
twangboy
87221933d9 Removed hwclock functions, added more descriptive fail message 2016-01-20 12:21:27 -07:00
Evan Borgstrom
b46df0e4b5 Allow recursive salt:// imports
Fixes #30465
2016-01-20 11:20:50 -08:00
justinta89
6227368830 Convert version to int, instead of comparing strings to ints 2016-01-20 12:00:50 -07:00
Colton Myers
2405ff11b5 Add yaml_safe filter 2016-01-20 11:50:18 -07:00
Mike Place
e425cbd654 Merge pull request #30359 from distil/zmq_filtering_bug_fix
Removes suspected copy/paste error for zmq_filtering functionailty
2016-01-20 11:42:42 -07:00
Jorge Schrauwen
eceb19783f fix broken os grains on SmartOS, only collect zonedata when we are in a SmartOS zone, map salt:role metadata to role grain 2016-01-20 18:37:51 +00:00
Mike Place
7b88d721a5 Merge pull request #30368 from lyft/boto_dynamodb
Update boto_dynamodb module and state
2016-01-20 11:23:15 -07:00
justinta89
20384a4810 Added InstallationError to except block 2016-01-20 11:05:41 -07:00
justinta89
baa274bca9 Updated pip_state to work with pip 8.0
Pip 8.0.0 added an InstallationError exception. Updated the state to catch that
exception properly.
2016-01-20 11:03:18 -07:00
Mike Place
13add7d142 Merge pull request #30448 from cournape/fix-osx-scripts-location
Fix osx scripts location
2016-01-20 10:59:29 -07:00