valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 00:55:19 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,973 Commits 24 Branches 182 Tags 341 MiB
4e4b3514b4
Commit Graph

76973 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicole Thomas
4e4b3514b4 Merge pull request #41054 from terminalmage/salt-jenkins-315 
Update package targets for Arch pkg tests
 2017-05-04 08:59:42 -06:00
Nicole Thomas
62dff52820 Merge pull request #41046 from twangboy/fix_pkg_remove 
Fix pkg.remove
 2017-05-04 08:58:56 -06:00
Nicole Thomas
2b47b7bec6 Merge pull request #41045 from terminalmage/clarify-gitfs-docs 
Clarify gitfs docs
 2017-05-03 16:24:54 -06:00
Erik Johnson
ee493bae47 Update package targets for Arch pkg tests 
Something else is installing pytz (likely via pip), causing filesystem
conflicts when the pkg integration tests try to install python2-pytz as
a dep of python2-django.

This commit also changes a bunch of the other tests so that they are
explicitly skipped instead of just being no-ops in cases where they are
not configured to be run. This provides more accurate information in the
overall test results.
 2017-05-03 17:02:32 -05:00
twangboy
2af38e5564 Use target instead of version_num 2017-05-03 14:20:40 -06:00
Nicole Thomas
819007cd00 Merge pull request #41032 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-03 13:31:58 -06:00
Erik Johnson
c757eda331 Clarify gitfs docs 
This improves cross links to the per-remote docs from the master config
file documentation.
 2017-05-03 13:34:56 -05:00
Mike Place
d7fbd38474 Merge pull request #41007 from jleproust/fix_lvm_empty_vg 
Recognize LVM2 pv with empty vg as orphan
 2017-05-03 12:24:50 -06:00
Nicole Thomas
4eab962e9e Merge pull request #41029 from rallytime/bp-38565 
Back-port #38565 to 2016.11
 2017-05-03 11:05:09 -06:00
rallytime
d26fd0bbf4 Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-05-03 09:57:23 -06:00
Drew Malone
2df93ae3ab Update management of ip addresses. 
- Assign static, private IP addresses.
- Ability to not assign a public IP to a VM.
 2017-05-03 09:36:03 -06:00
Nicole Thomas
97500f078d Merge pull request #41012 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-05-02 16:06:39 -06:00
Nicole Thomas
b00acb0034 Merge pull request #41011 from terminalmage/docker-refresh-credentials 
Use proposed docker-py reload_config() function
 2017-05-02 16:06:21 -06:00
Erik Johnson
b8d1dcc307 Use proposed docker-py reload_config() func 
See https://github.com/docker/docker-py/pull/1586

This allows an existing client instance to disregard its cached auth
config and use the most up-to-date login info from the config.json.
 2017-05-02 15:03:19 -05:00
Julien Leproust
3b9a845145 Recognize LVM2 pv with empty vg as orphan 2017-05-02 21:59:56 +02:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
 2017-05-02 12:52:59 -06:00
Mike Place
19894f68ca Merge pull request #40724 from cro/minion_key_revoke_cfg 
Minion key revoke cfg
 2017-05-02 11:18:05 -06:00
Mike Place
e210eaead4 Merge pull request #40726 from benediktwerner/fix-minions-remain-pending-after-autosign-and-typo 
Fixed minion keys remaining pending after auto signing and fixed typo (Resubmitted to 2016.3)
 2017-05-02 10:57:33 -06:00
Mike Place
4f342e2fe5 Merge pull request #40960 from danlsgiga/2016.11 
Fix consul module "AttributeError: 'dict' object has no attribute 'json'"
 2017-05-02 10:16:56 -06:00
Mike Place
c3b329b398 Merge pull request #40963 from twangboy/fix_win_useradd 
Fix fullname parameter for add function
 2017-05-02 10:08:58 -06:00
Mike Place
d79c033239 Merge pull request #40995 from twangboy/remove_utils 
Remove unused code fragments
 2017-05-02 09:31:57 -06:00
Nicole Thomas
129859f79b Merge pull request #40952 from terminalmage/fix-dockerng.login-docs 
Fix documentation for docker login function in pre-nitrogen release branches
 2017-05-02 09:17:59 -06:00
Nicole Thomas
c6162876d6 Merge pull request #40991 from rallytime/bp-40982 
Back-port #40982 to 2016.11
 2017-05-01 16:31:29 -06:00
twangboy
8c01aacd9b Remove unused code fragments 2017-05-01 14:26:37 -06:00
Mike Place
3fb24929c6 Merge pull request #40987 from gtmanfred/2016.11 
get sudo_password correctly
 2017-05-01 13:39:54 -06:00
Mike Place
ecbac138d1 Merge pull request #40992 from gtmanfred/netdev 
fix bug in status.netdev
 2017-05-01 13:38:34 -06:00
Mike Place
d852320d34 Merge pull request #40993 from gtmanfred/smtp 
smtp state can use profile or sender
 2017-05-01 13:35:46 -06:00
Daniel Wallace
068ebfd9ec smtp state can use profile or sender 2017-05-01 11:10:04 -06:00
Daniel Wallace
a9eed7f1c9 fix bug in status.netdev 
This was introduced in 9042aa61ac
and then later fixed to be an insert here
703f2b4dc6, but all the comps values were never
shifted up 1 to take into account that the list was now one entry longer
 2017-05-01 10:52:41 -06:00
Alexey Aksenov
8fcb7205db Fix docker_events field handling 
[DEBUG   ] Sending event: tag = salt/engines/docker_events/attach; data = {'Type': 'container', 'from': 'a58442926dc0', 'Actor': {'Attributes': {'image': 'a58442926dc0', 'name': 'brave_banach'}, 'ID': '705dc8d539de400e57d970861c494f3039522198135f450a45c836d12e4edd16'}, 'id': '705dc8d539de400e57d970861c494f3039522198135f450a45c836d12e4edd16', 'time': 1493620435, 'status': 'attach', '_stamp': '2017-05-01T06:33:55.078234', 'Action': 'attach', 'timeNano': 1493620435077227350}
Traceback (most recent call last):
  File "/home/ezh/.virtualenvs/salt/lib/python3.4/site-packages/salt/engines/docker_events.py", line 83, in start
    fire('{0}/{1}'.format(tag, data['status']), data)
KeyError: 'status'
[INFO    ] Process <class 'salt.engines.Engine'> (21196) died with exit status 0, restarting...
 2017-05-01 10:48:17 -06:00
Daniel Wallace
2ed694cac6 get sudo_password correctly 2017-05-01 08:59:57 -06:00
twangboy
5371b6b85e Fix fullname parameter for add function 2017-04-28 14:30:48 -06:00
Nicole Thomas
fc26fb8a05 Merge pull request #40958 from rallytime/bp-40939 
Back-port #40939 to 2016.11
 2017-04-28 12:01:17 -06:00
Nicole Thomas
a586e12180 Merge pull request #40957 from rallytime/bp-38115 
Back-port #38115 to 2016.11
 2017-04-28 12:01:01 -06:00
Nicole Thomas
00a15eba60 Merge pull request #40905 from rkgrunt/40635 
Fixed issue with parsing of master minion returns when batching is en…
 2017-04-28 11:52:31 -06:00
Nicole Thomas
bb50d4f646 Merge pull request #40954 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-04-28 10:41:49 -06:00
Daniel Santos
6e4cc6db47 Fix consul module "AttributeError: 'dict' object has no attribute 'json'" 
Consul API has changed a little bit, some small adjustments to make the
module work again
 2017-04-28 10:13:56 -06:00
Ch3LL
3e9394862f allow vmware to query deploy arg from opts 2017-04-28 09:30:00 -06:00
C. R. Oldham
eb889173b0 Revert "fix augeas module so shlex doesn't strip quotes" 2017-04-28 09:28:46 -06:00
rallytime
7f31e41aa6 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pip.py
 2017-04-28 09:20:59 -06:00
Erik Johnson
dfbbeb5946 Fix documentation for docker login function in pre-nitrogen release branches 
These should be referencing ``dockerng.login``, not ``docker.login``.
 2017-04-28 09:32:04 -05:00
Mike Place
909d519ddb Merge pull request #40751 from rallytime/fix-39531 
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
 2017-04-28 06:56:05 -06:00
Mike Place
18fdd8cc34 Merge pull request #40861 from DSRCorporation/bugs/37307_minion_run_jobs_twice 
Don't run status.master while minion is failing-over.
 2017-04-28 06:14:55 -06:00
Mike Place
62cb7b1ae6 Merge pull request #40923 from terminalmage/aptpkg-install-fix-unhold 
aptpkg: fix temp pkg unhold when version is specified
 2017-04-28 05:59:53 -06:00
Mike Place
9d92ba7878 Merge pull request #40933 from gtmanfred/2016.11 
allow master_port to be a string
 2017-04-28 05:54:57 -06:00
Mike Place
d5e0b8b655 Merge pull request #40934 from gtmanfred/ipv6 
Only display IPvX warning if role is master
 2017-04-28 05:53:50 -06:00
Mike Place
8fdfe4ece6 Merge pull request #40935 from gtmanfred/softlayer 
Attempt to connect to public ip address in softlayer
 2017-04-28 05:43:57 -06:00
Daniel Wallace
7855cd6ce6 Only display IPvX warning if role is master 
Also, don't render ipv6 grains when ipv6 is set to False
 2017-04-27 13:58:51 -06:00
Nicole Thomas
7404309bec Merge pull request #40936 from terminalmage/release_notes 
Add dockerng fixes to 2016.11.4 release notes
 2017-04-27 13:54:15 -06:00
Erik Johnson
e494ae43e5 Add dockerng fixes to 2016.11.4 release notes 2017-04-27 14:07:29 -05:00