valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,906 Commits 24 Branches 182 Tags 341 MiB
7443c0ef0a
Commit Graph

67906 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mircea Ulinic
7443c0ef0a Tiny doc fix 2016-03-24 11:14:01 +00:00
Nicole Thomas
7116fd6f3c Merge pull request #32080 from s-schweer/nova_cloud 
fixed auto assigning of floating_ips for clouds.nova
 2016-03-23 15:30:54 -06:00
jacobhammons
518167b41b Merge pull request #32101 from jacobhammons/releases 
Release docs for 2015.8.8 and 2015.5.10
 2016-03-23 14:09:13 -06:00
Jacob Hammons
487edb1924 Release docs for 2015.8.8 and 2015.5.10 2016-03-23 14:08:36 -06:00
Nicole Thomas
f3872c3da3 Merge pull request #32090 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-23 13:51:57 -06:00
Mike Place
b5a774b3ee Merge pull request #32082 from mirceaulinic/CF-REDIS-RETURNER 
Fix issue #32077
 2016-03-23 11:34:04 -06:00
Mike Place
7da969aa29 Merge pull request #32060 from guettli/patch-1 
removed "all": pillar is about "particular minion"
 2016-03-23 11:19:44 -06:00
rallytime
55544a84a1 Merge branch '2016.3' into 'develop' 
Conflicts:
  - salt/minion.py
 2016-03-23 11:04:42 -06:00
C. R. Oldham
0fd625785c Merge pull request #32055 from mirceaulinic/CF-NTP-STATE 
netntp state: manage NTP peers on network devices
 2016-03-23 10:45:13 -06:00
Mike Place
360f3369f0 Merge pull request #32061 from thusoy/ignore-crontab-retcode 
Ignore retcode on crontab call
 2016-03-23 10:42:06 -06:00
Mike Place
6dc0e7aced Merge pull request #32070 from skizunov/develop3 
Windows: Correctly handle time.sleep IOError exception
 2016-03-23 10:40:08 -06:00
Nicole Thomas
e85ed31777 Merge pull request #32083 from guettli/patch-2 
"Fire Event Notifications" moved down
 2016-03-23 10:39:55 -06:00
Nicole Thomas
c6cf59736b Merge pull request #32069 from rallytime/github-mod-docs 
Make sure kwarge reference is correct in CLI Example
 2016-03-23 10:39:29 -06:00
Thomas Güttler
9bd14c1d3d "Fire Event Notifications" moved down 
it is less important. "Requisites" is what the page is about.
 2016-03-23 17:15:29 +01:00
Mike Place
e19fe847bd Merge pull request #32062 from rallytime/mac-assistive-tests 
Mac assistive tests
 2016-03-23 09:51:36 -06:00
Nicole Thomas
fc1ba937aa Merge pull request #32065 from TheNullByte/patch-1 
Fix an issue with the minion targeting example in docs
 2016-03-23 09:51:27 -06:00
Nicole Thomas
57cf405fd6 Merge pull request #31552 from alprs/fix-localectl 
Bring back localectl parsing in locale module for when dbus module is unavailable
 2016-03-23 09:47:27 -06:00
Mircea Ulinic
02fdf22b9c If is_proxy() get connection details from __opts__ 2016-03-23 15:45:45 +00:00
Nicole Thomas
37c410fee4 Merge pull request #32079 from rallytime/merge-32041 
Merge #32041 with test removal
 2016-03-23 09:42:35 -06:00
Stefan Schweer
b125fcdffe fixed auto assigning of floating_ips for clouds.nova 2016-03-23 16:31:26 +01:00
Stefan Schweer
a480b2b108 fixed auto assigning of floating_ips for clouds.nova 2016-03-23 16:27:34 +01:00
Mike Place
b0eff6fbaa Merge pull request #32057 from skizunov/develop2 
Do not exit process on invalid master key
 2016-03-23 09:24:34 -06:00
Nicole Thomas
9534a334d3 Merge pull request #32076 from MIBc/virt_ret 
Summary:Correct a small defect in doc of salt/modules/nova.py
 2016-03-23 09:17:17 -06:00
Nicole Thomas
11f2ba829d Merge pull request #32071 from jtand/skip_client_test_if_not_zmq 
Skipped test if zeromq is not transport
 2016-03-23 09:15:32 -06:00
C. R. Oldham
6a9ec9ce49 Merge pull request #32043 from mirceaulinic/CF-NAPALM-NTP 
New module: NAPALM_NTP, using NAPALM proxy

Merging, test failures are unrelated.

@mirceaulinic Thank you for your contribution.
 2016-03-23 08:54:08 -06:00
rallytime
b13fdc1831 Remove useless tests 2016-03-23 08:49:52 -06:00
Nicole Thomas
c610890041 Merge pull request #32073 from nmadhok/patch-3 
Update vmware.rst
 2016-03-23 08:43:55 -06:00
Nicole Thomas
298e0453b8 Merge pull request #32072 from nmadhok/patch-2 
Update salt.cloud.clouds.vmware.rst
 2016-03-23 08:43:25 -06:00
Lvjiawei
441a2b2d77 Summary:Correct a small defect in doc of salt/modules/nova.py 2016-03-23 21:03:52 +08:00
Stefan Schweer
1ee6e7b04f replaced ',' for whitespace as split seperator for rabbitmq tags 
- fixed unit tests
   * fixed test for states.rabbitmq_user.present
 2016-03-23 11:55:27 +01:00
Nitin Madhok
c5f26fbebb Update vmware.rst 2016-03-22 22:22:31 -04:00
Nitin Madhok
8e319ea52d Update salt.cloud.clouds.vmware.rst 2016-03-22 22:11:15 -04:00
Justin Anderson
df9abd5021 Skipped test if zeromq is not transport 2016-03-22 16:01:18 -06:00
Nicole Thomas
1af2e41a17 Merge pull request #32063 from rallytime/bp-31995 
Back-port #31995 to 2016.3
 2016-03-22 15:59:43 -06:00
Sergey Kizunov
b31a01cf8a Windows: Correctly handle time.sleep IOError exception 
`ProcessManager.run()` uses `time.sleep()` on Windows. When
the process exits on Windows, sometimes we see a call stack
that looks like this:

IOError: [Errno 4] Interrupted function call
Traceback (most recent call last):
  File "... \bin\Scripts\salt-master", line 22, in
    salt_master()
  File "... \site-packages\salt\scripts.py", line 47, in salt_master
    master.start()
  File "... \site-packages\salt\cli\daemons.py", line 157, in start
    self.master.start()
  File "... \site-packages\salt\master.py", line 557, in start
    process_manager.run()
  File "... \site-packages\salt\utils\process.py", line 301, in run
    time.sleep(10)
IOError: [Errno 4] Interrupted function call

It seems that `time.sleep()` on Windows can throw an `IOError`
exception with an errno of `EINTR` (4). We now cleanly handle this
case to avoid this being logged as an error.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-03-22 16:52:43 -05:00
Nicole Thomas
0ea909b617 Merge pull request #32064 from rallytime/bp-31961 
Back-port #31961 to 2016.3
 2016-03-22 15:44:42 -06:00
rallytime
48cfd01606 Make sure kwarge reference is correct in CLI Example 2016-03-22 15:42:46 -06:00
Nicole Thomas
98445e5590 Merge pull request #32058 from lyft/kms-paging 
Add paging for kms grants
 2016-03-22 15:38:54 -06:00
Kris Raney
3c6d0e8fc1 Make sure there are no connection object cache hits on boto_* unit tests. 2016-03-22 14:49:18 -06:00
TheNullByte
0b441da399 Fix an issue with the minion targeting example 
There wasn't the grain selector during the targeting, so the example actually never targets any minions.
 2016-03-22 16:47:42 -04:00
Nicole Thomas
9216e303e1 Merge pull request #31961 from kraney/kraney_bugfix 
Make sure there are no connection object cache hits on boto_* unit te…
 2016-03-22 14:38:46 -06:00
Gary Richmond
d2949ff2f5 Alphabetized region list; corrected curly quote 2016-03-22 14:36:28 -06:00
Gary Richmond
9fffb5d1e9 Add support for ap-northeast-2 and us-gov-west-1 regions in AWS 2016-03-22 14:36:28 -06:00
rallytime
b1bdb688ae Add unit tests for new remove function, too. 2016-03-22 14:25:49 -06:00
Tarjei Husøy
b09a570248 Ignore retcode on crontab call 
Ensures there's no error logging if the crontab doesn't exist.
 2016-03-22 13:20:05 -07:00
Thomas Güttler
4aec2c502d removed "all": pillar is about "particular minion" 2016-03-22 21:16:34 +01:00
rallytime
88ba210f86 Add mac_assistive integration tests 
- Updates mac_assistive module to use cmd.run_all
- Updates current mac_assistive_test unit tests with cmd.run_all change
- Adds module integration tests for mac_assistive execution module
 2016-03-22 14:11:40 -06:00
Ryan Lane
32a2eb6cd1 Add paging for kms grants 2016-03-22 11:33:29 -07:00
Sergey Kizunov
3bf82c5f38 Do not exit process on invalid master key 
Currently, the behavior is to exit the salt-minion process on
an invalid master key. This change will pass an error back via
'SaltClientError' instead. Some benefits of this:

- If 'failover' mode is in use, it will correctly move to the
next master in the list.
- Relying on the salt-minion keep-alive mechanism to retry
may not be desirable (extra process) or available (not supported
on Windows minions).
- This will defer to the pre-existing mechanisms of `auth_tries`
and `master_tries` which seem better tailored for this type of
issue.
- There has been observed a race condition (at least in the TCP
transport) where if the salt-master goes up at a certain time when
the salt-minion is already trying to connect to the master, the
'invalid master key' condition will be triggered. This condition will
automatically clear itself on the next retry / failover.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-03-22 13:26:40 -05:00
Mircea Ulinic
11e32f44b4 Small quack 2016-03-22 17:54:59 +00:00