valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
77,756 Commits 24 Branches 182 Tags 341 MiB
4089b7b1bc
Commit Graph

77756 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Erik Johnson
4089b7b1bc Use socket.AF_INET6 to get the correct value instead of doing an OS check 
This builds on #43014 with a more future-proof solution.
 2017-08-17 12:12:27 -05:00
garethgreenaway
ff1caeee68 Merge pull request #43014 from Ch3LL/fix_network_mac 
Change AF_INET6 family for mac in test_host_to_ips
 2017-08-17 09:17:50 -07:00
Ch3LL
b8eee4401e Change AF_INET6 family for mac in test_host_to_ips 2017-08-17 10:55:53 -04:00
Nicole Thomas
1ee9499d28 Merge pull request #42968 from vutny/doc-salt-cloud-ref 
[DOCS] Fix link to Salt Cloud Feature Matrix
 2017-08-16 09:16:16 -04:00
Denys Havrysh
44ed53b1df [DOCS] Fix link to Salt Cloud Feature Matrix 2017-08-16 10:26:45 +03:00
Mike Place
923f9741fe Merge pull request #42291 from vutny/fix-38839 
Fix #38839: remove `state` from Reactor runner kwags
 2017-08-15 17:01:08 -06:00
Mike Place
c20bc7d515 Merge pull request #42940 from gtmanfred/2016.11 
create new ip address before checking list of allocated ips
 2017-08-15 15:47:17 -06:00
Nicole Thomas
d6496eca72 Merge pull request #42959 from rallytime/bp-42883 
Back-port #42883 to 2016.11
 2017-08-15 17:25:47 -04:00
Daniel Wallace
253e216a8d fix IP address spelling 2017-08-15 12:30:03 -06:00
rallytime
c6b9ca4b9e Lint fix: add missing space 2017-08-15 14:26:44 -04:00
rallytime
5597b1a30e Skip 2 failing tests in Python 3 due to upstream bugs 2017-08-15 14:26:44 -04:00
rallytime
a0b19bdc27 Update account id value in boto_secgroup module unit test 
This value was updated in moto 1.0.0 with the following commit:

5f3fbff627
 2017-08-15 14:23:00 -04:00
rallytime
60b406e088 @mock_elb needs to be changed to @mock_elb_deprecated as well 2017-08-15 14:23:00 -04:00
rallytime
6ae1111295 Replace @mock_ec2 calls with @mock_ec2_deprecated calls 
moto versions >= 1.0.0 have changed the way the mocked connections through
boto are handled with the @mock_ec2 decorator. They use the boto3 connection
method. However, since we are still using boto in many places, we need to use
the new @mock_ec2_deprecated decorator instead to handle the boto connection
functions for the unit tests.

Versions of moto < 1.0.0 are not Python 3 compatible, so salt-jenkins should
be installing newer versions of moto for those tests. Unfortunately, we cannot
install an older version of moto for Python2 that use the original @mock_ec2 call
and also import the @mock_ec2_deprecated function for newer versions of moto
simultaneously as the @mock_ec2_deprecated function doesn't exist in older
versions of moto.
 2017-08-15 14:22:59 -04:00
Nicole Thomas
6366e05d0d Merge pull request #42944 from Ch3LL/2016.11.6_follow_up 
[2016.11] Add clean_id function to salt.utils.verify.py
 2017-08-15 14:06:11 -04:00
Mike Place
49d339c976 Merge pull request #42952 from Ch3LL/latest_2016.11 
[2016.11] Bump latest and previous versions
 2017-08-15 11:23:02 -06:00
Ch3LL
74e7055d54 [2016.11] Bump latest and previous versions 2017-08-15 12:54:12 -04:00
Mike Place
b0d2e05a79 Merge pull request #42950 from Ch3LL/2016.11.7_docs 
Add Security Notice to 2016.11.7 Release Notes
 2017-08-15 10:50:23 -06:00
Ch3LL
a6f902db40 Add Security Notice to 2016.11.77 Release Notes 2017-08-15 12:35:37 -04:00
Ch3LL
7e0a20afca Add release notes for 2016.11.7 release 2017-08-15 12:26:35 -04:00
Ch3LL
63823f8c3e Add clean_id function to salt.utils.verify.py 2017-08-15 12:24:47 -04:00
Daniel Wallace
bd63074e7a create new ip address before checking list of allocated ips 
This will help prevent a race condition of all cloud servers being built in
parallel trying to build with the same floating ip address.
 2017-08-15 09:19:05 -06:00
Nicole Thomas
c0ff69f88c Merge pull request #42836 from lyft/backport-utils.versions-to-2016.11 
Backport salt.utils.versions from develop to 2016.11
 2017-08-14 16:56:54 -04:00
Nicole Thomas
64a79dd5ac Merge pull request #42919 from rallytime/bp-42871 
Back-port #42871 to 2016.11
 2017-08-14 16:43:59 -04:00
Nicole Thomas
bea8ec1098 Merge pull request #42918 from rallytime/bp-42848 
Back-port #42848 to 2016.11
 2017-08-14 16:43:42 -04:00
Mike Place
52bce329cb Merge pull request #42861 from twangboy/win_pkg_install_salt 
Fix pkg.install salt-minion using salt-call
 2017-08-14 12:07:22 -07:00
amalleo25
4e46c968e6 Update joyent.rst 
Missing colon in example cloud.profiles.d config file.
 2017-08-14 14:35:50 -04:00
Dmitry Kuzmenko
cdb48126f7 Make lint happier. 2017-08-14 14:34:33 -04:00
Dmitry Kuzmenko
62eca9b00b Execute fire_master asynchronously in the main minion thread. 
In another case it will block minion execution if master is not
responding.
This is actual for MultiMaster configuration because blocks minion to
respond to the active master requests if another one is down.
 2017-08-14 14:34:33 -04:00
Nicole Thomas
b9f4f87aa5 Merge pull request #42798 from s-sebastian/2016.11 
Update return data before calling returners
 2017-08-14 11:51:29 -04:00
Aneesh Agrawal
86ce7004a2 Backport salt.utils.versions from develop to 2016.11 
This makes it easier to backport boto* and other modules
from develop that are using the salt.utils.versions module.

Additionally, because the `blacklisted-module` Salt pylint module
is not available in 2016.11, remove references to it.
 2017-08-11 23:41:56 +00:00
Nicole Thomas
c15d0034fe Merge pull request #41977 from redmatter/fix-dockerng-network-ignores-test 
Fix dockerng.network_* ignoring of tests=True
 2017-08-11 14:37:19 -04:00
Nicole Thomas
3b9c3c5671 Merge pull request #42886 from sarcasticadmin/adding_docs_salt_outputs 
Adding missing output flags to salt cli docs
 2017-08-11 14:35:18 -04:00
Nicole Thomas
e5b98c8a88 Merge pull request #42882 from gtmanfred/2016.11 
make sure cmd is not run when npm isn't installed
 2017-08-11 13:53:14 -04:00
Daniel Wallace
da3402a53d make sure cmd is not run when npm isn't installed 
apparently the skipIf on the functions still get run, even if the function is
going to be skipped based on a skipIf on the class.
 2017-08-11 10:58:00 -06:00
Nicole Thomas
5962c9588b Merge pull request #42788 from amendlik/saltify-timeout 
Remove waits and retries from Saltify deployment
 2017-08-11 11:38:05 -04:00
Nicole Thomas
227ecddd13 Merge pull request #42877 from terminalmage/add-cron-state-virtual 
Add virtual func for cron state module
 2017-08-11 11:33:09 -04:00
Nicole Thomas
ab9f6cef33 Merge pull request #42859 from terminalmage/gitpython-git-cli-note 
Add note about git CLI requirement for GitPython to GitFS tutorial
 2017-08-11 10:53:02 -04:00
Nicole Thomas
682b4a8d14 Merge pull request #42856 from gtmanfred/2016.11 
skip cache_clean test if npm version is >= 5.0.0
 2017-08-11 09:39:19 -04:00
Erik Johnson
f1de196740 Add virtual func for cron state module 
This prevents a traceback when you attempt to use a cron state without
cron being installed.
 2017-08-11 08:32:19 -05:00
Nicole Thomas
01ea854029 Merge pull request #42864 from whiteinge/syndic-log-root_dir 
Make syndic_log_file respect root_dir setting
 2017-08-11 09:28:21 -04:00
Seth House
4b1f55da9c Make syndic_log_file respect root_dir setting 2017-08-10 17:06:49 -06:00
twangboy
0d3789f0c6 Fix pkg.install salt-minion using salt-call 
When executing `pkg.install salt-minion` using salt-call there is still a
python process running maintaining locks on files that the installer is
trying to overwrite. This is because the `install` function is using
`task.run_wait` which waits for the task to finish before returning
success. This is fine for standard programs that install using the
schedular, but bad for salt.

This change will use `task.run` and check that the task is actually
running and then return that the task was started. This will apply only
if the task was scheduled for `salt-minion` or `salt-minion-py3`.
 2017-08-10 16:36:12 -06:00
Erik Johnson
35e05c9515 Add note about git CLI requirement for GitPython to GitFS tutorial 2017-08-10 16:47:47 -05:00
Robert James Hernandez
744bf954ff Adding missing output flags to salt cli 2017-08-10 13:19:08 -07:00
Daniel Wallace
b458b89fb8 skip cache_clean test if npm version is >= 5.0.0 2017-08-10 14:17:47 -06:00
Nicole Thomas
2dde1f77e9 Merge pull request #42851 from terminalmage/bp-42651 
Backport #42651 to 2016.11
 2017-08-10 14:02:38 -04:00
Daniel Wallace
a3da86eea8 fix syntax 2017-08-10 11:08:27 -05:00
Daniel Wallace
6ecdbcec1d make sure names are correct 2017-08-10 11:08:26 -05:00
Daniel Wallace
f83b553d6e add py3 for versionlock 2017-08-10 11:08:26 -05:00