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,081 Commits 24 Branches 182 Tags 341 MiB
791499c813
Commit Graph

8867 Commits

Author SHA1 Message Date
rallytime
342a5ac0b8 Merge branch '2016.11' into 'develop' 
No conflicts.
 2017-01-06 10:31:51 -05:00
zwo-bot
9fadb13524 Fix #38558 - pillar.get with default= ...,merge=true influence subsequent calls of pillar.get (#38579) 
* added deepcopy of default if merge=True

* ticket 38558: add unit test, deepcopy() only if necessary

* add test for pillar.get() + default value
 2017-01-06 10:10:19 -05:00
Mike Place
6646a95c1e Merge pull request #38490 from eradman/cloud_config 
Change map and profile extends merge strategy to use recursive update
 2017-01-05 16:35:41 -07:00
Mike Place
e8c115f5d3 Move comment to top of class to avoid lint error 2017-01-05 13:14:52 -07:00
Mike Place
aa7ed5960f Merge pull request #38592 from alexbleotu/location_override_test_fixes-gh 
Location override test fixes gh
 2017-01-05 13:09:57 -07:00
Alexandru Bleotu
54e41b16a5 Updated config_test tests to use CONFIG_DIR and not /etc/salt 2017-01-05 17:31:40 +00:00
Alexandru Bleotu
0b848ec184 Fixed WinrepoTestCase.test_genrepo to load BASE_FILE_ROOTS_DIR from salt.syspaths 2017-01-05 17:31:33 +00:00
rallytime
44d09b8606 Add 'travisci.parse_qs' to the allow_failures option 
Fixes the `integration.modules.sysmod.SysModuleTest.test_valid_docs`
test failure which thinks a CLI example is needed.
 2017-01-05 12:27:59 -05:00
rallytime
30f14d15df Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/config/__init__.py
  - salt/engines/slack.py
 2017-01-04 16:54:58 -05:00
rallytime
c47f34f535 Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/modules/chocolatey.py
  - salt/modules/htpasswd.py
  - salt/modules/img.py
  - salt/modules/smartos_virt.py
  - salt/modules/virtualenv_mod.py
  - salt/modules/xapi.py
  - salt/modules/zypper.py
  - salt/state.py
 2017-01-04 15:34:41 -05:00
Eric Radman
3ec910cf34 Change map and profile extends merge strategy to use recursive update 
Previously only top-level data elements could be overridden in a map or
extended profile entry. This change adjusts map and profile evaluation
to use a recursive merge using salt.utils.dictupdate.update().

This is a break with compatibility, but in the common case a cloud
profile or map is not structured to truncate configuration but to add
further detail to the profile that it extends.

Update map docs with an example from VMware where we chan now change a
network parameter without having to repeat other device information such
as disk controllers.
 2017-01-04 14:11:53 -05:00
Mike Place
1895eb7533 Merge pull request #38529 from rallytime/merge-2016.11 
[2016.11] Merge forward from 2016.3 to 2016.11
 2017-01-04 10:06:56 -07:00
Mike Place
325dc56e59 Merge pull request #38554 from multani/fix/30454 
Fix YAML deserialization of unicode
 2017-01-04 08:31:16 -07:00
Megan Wilhite
1c951d152b fix gce image bug (#38542) 2017-01-04 09:08:04 -05:00
Jonathan Ballet
2e7f743371 yaml: support unicode serialization/deserialization 
Fix: #30454
 2017-01-04 13:29:28 +01:00
Jonathan Ballet
df76113c5c jinja: test the "yaml" filter with ordered dicts 2017-01-04 13:29:28 +01:00
Pablo Suárez Hernández
68d5475c1f Fixing Snapper unit tests for SUBVOLUME support 2017-01-04 08:59:51 +00:00
rallytime
9ad362fbde Merge branch '2016.11' into 'develop' 
Conflicts:
  - salt/states/kapacitor.py
 2017-01-03 10:17:18 -05:00
rallytime
85f470207c Merge branch '2016.3' into '2016.11' 
No conflicts.
 2017-01-03 10:13:06 -05:00
Daniel Wallace
048b9f6b9d add test 2016-12-29 17:08:24 -06:00
Mike Place
aa0c843553 Merge pull request #38461 from alprs/fix-kapacitor_changes 
Improvements/fixes to kapacitor task change detection
 2016-12-29 10:08:46 -07:00
Andreas Lutro
52721e97d6 clean up and fix tests 2016-12-29 11:14:24 +01:00
James Payor
d905c0730e Fixes for the behaviour of rabbitmq list_* module functions (all return lists/dicts as appropriate now). Fix bug in plugin_is_enabled and add list_{available, enabled}_plugins. 2016-12-29 19:40:07 +11:00
twangboy
e96bfe8fa2 Change OSX/OS X to macOS where possible 2016-12-28 14:49:46 -07:00
Mike Place
5536aec4b1 Merge pull request #38414 from sevagh/ini_manage 
Add strict flag to ini.options_present
 2016-12-28 12:25:25 -07:00
Daniel Wallace
7b7c6b3878 file.line fail with mode=delete 
If the file is empty, it also fails, fix that.
 2016-12-28 11:51:45 -06:00
Sevag Hanssian
727194b2a0 Add strict flag to ini.options_present 2016-12-27 11:50:10 -05:00
Mike Place
34621930aa Merge pull request #38420 from rallytime/module-deprecations 
Removed various deprecation notices from salt/modules/* files
 2016-12-27 09:09:58 -07:00
rallytime
a2927226ea Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/modules/all/salt.modules.napalm_route.rst
  - doc/ref/modules/all/salt.modules.napalm_snmp.rst
  - doc/ref/modules/all/salt.modules.napalm_users.rst
  - doc/ref/states/all/salt.states.netsnmp.rst
  - doc/ref/states/all/salt.states.netusers.rst
  - salt/states/cron.py
 2016-12-22 12:15:06 -07:00
rallytime
0a27f941f7 Removed various deprecation notices from salt/modules/* files 
Added docs to the release notes for all of these changes.

The affected modules are:

- htpasswd
- img
- smartos_virt
- virt
- virtualenc_mod
- xapi
- zypper
 2016-12-22 11:57:26 -07:00
Mike Place
bbc149c67f Merge pull request #38342 from scthi/bugfix-ext-pillar-nodegroups 
Bugfix ext pillar nodegroups
 2016-12-22 09:47:42 -07:00
Thilo Schmalfuss
dba315c4b6
ext-pillar nodegroups works for all minions now. 2016-12-22 11:57:17 +01:00
Mike Place
12436efb54 Merge pull request #38354 from gmacon/pip-freeze-all 
Use --all when calling pip.py
 2016-12-20 13:40:20 -07:00
rallytime
494a06bee2 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/minion.rst
 2016-12-20 10:03:44 -07:00
George Macon
dca24b270e Use --all when calling pip.py 
Fixes #38253.
 2016-12-20 11:48:00 -05:00
Mike Place
530f495955 Merge pull request #38073 from doublescoring/2016.11 
2016.11
 2016-12-20 07:51:10 -07:00
Mike Place
9350808fea Merge pull request #38361 from rallytime/deprecate-client_acl-client_acl_blacklist 
Remove support for client_acl and client_acl_blacklist
 2016-12-20 06:33:23 -07:00
rallytime
a9f85f0dbe Remove support for client_acl and client_acl_blacklist 
These have been deprecated for some time and were marked for
removal in Nitrogen.

publisher_acl and publisher_acl_blacklist should be used instead.
 2016-12-19 16:18:48 -07:00
rallytime
513058945c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/states/requisites.rst
  - doc/topics/cloud/profitbricks.rst
  - doc/topics/cloud/vsphere.rst
  - doc/topics/releases/0.9.8.rst
  - doc/topics/releases/releasecandidate.rst
  - salt/cloud/clouds/vsphere.py
  - salt/minion.py
  - salt/states/archive.py
  - tests/unit/states/archive_test.py
 2016-12-19 14:58:39 -07:00
Erik Johnson
79231a5d8a archive.extracted: don't try to cache local sources (#38285) 
* archive.extracted: don't try to cache local sources

This will keep us from trying to cache file when we already have it
locally, which will help significantly with larger archives.

* Update tests to reflect change in cache behavior

* Add mock return for /bin/tar

This fixes failing tests for Ubuntu 14
 2016-12-19 14:37:58 -07:00
rallytime
8f80916432 Merge branch '2016.11' into 'develop' 
Conflicts:
  - doc/ref/configuration/master.rst
  - doc/topics/cloud/index.rst
  - salt/states/cron.py
 2016-12-19 14:00:52 -07:00
Mike Place
86c53b8efd Merge pull request #38172 from rallytime/win-deprecations 
Remove support for deprecation options/functions in win* files
 2016-12-19 07:33:05 -07:00
Mike Place
a01fade604 Merge pull request #38333 from amendlik/states-alternatives 
Suppress errors when checking if an alternative exists
 2016-12-19 06:40:48 -07:00
Elias Wulcan
266e0a465c Fixed nested orchestrate not respecting failures 
Client was only setting success to false if the function called raised
an exception. This commit changes it to verify the content of return
value with check_state_result
 2016-12-19 10:29:05 +01:00
Adam Mendlik
8bfcd5bcd5 Adjust alternatives test for updated error message 2016-12-18 10:04:24 -07:00
Mike Place
09d9cff992 Merge pull request #38288 from terminalmage/archive-extracted-local-source-2016.3 
archive.extracted: don't try to cache local sources (2016.3 branch)
 2016-12-18 06:07:10 -07:00
Mike Place
39eed71eca Merge pull request #38295 from porunov/develop 
Add path style requests and http protocol support to the s3 module
 2016-12-18 05:57:37 -07:00
rallytime
62978cb7a0 Don't check the doc/conf.py file for doc markup refs 2016-12-16 13:56:12 -07:00
Erik Johnson
845e3d0e75 Update tests to reflect change in cache behavior 2016-12-16 14:09:48 -06:00
rallytime
770e732d76 Add a unit test to search for new doc markup refs 2016-12-16 11:44:39 -07:00