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
85,023 Commits 24 Branches 182 Tags 341 MiB
330d989b46
Commit Graph

85023 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Denys Havrysh
330d989b46 Import util modules on Master like it works on Minion 2017-08-23 11:28:02 +03:00
Mike Place
9f0a64a137 Merge pull request #42560 from ArcaniteSolutions/improve_http_json_and_yaml 
pillar/http_json and yaml: replace %s with minion_id in urls
 2017-08-22 14:39:55 -06:00
Mike Place
7c68c93e93 Merge pull request #42720 from kunal-bajpai/modularise-tokens 
Modularise eauth token storage and authentication
 2017-08-22 14:10:45 -06:00
Nicole Thomas
50c8500a80 Merge pull request #43119 from cachedout/nacl_renderer_release_notes 
Add release note for nacl renderer
 2017-08-22 15:54:43 -04:00
Mike Place
4f4b41112c Merge pull request #43116 from lomeroe/fix_42279 
Fix 42279 in develop
 2017-08-22 13:50:57 -06:00
Mike Place
449c4c53c3 Add release note for nacl renderer 
Refs #41868
 2017-08-22 13:38:21 -06:00
Mike Place
874dd2245a Merge pull request #41868 from yagnik/nacl_renderer 
Add support for nacl renderer for encrypted data
 2017-08-22 13:36:38 -06:00
Mike Place
d0e71639c7 Merge pull request #42460 from pakdel/mssql_states 
MSSQL states
 2017-08-22 12:32:19 -06:00
Mike Place
d45f85f116 Merge pull request #43059 from whiteinge/cherrypy-stats-disable-auth 
Add flag to remove authentication requirement for /stats endpoint
 2017-08-22 12:23:36 -06:00
Nicole Thomas
177a4c366a Merge pull request #42729 from DSRCorporation/features/19732_extended_ext_auth 
Allow `external_auth` limit funs/args for runner/wheel modules.
 2017-08-22 14:19:06 -04:00
Mike Place
7d52bcee46 Merge pull request #42894 from gilbsgilbs/postgres-valid-until 
Add support for PostgreSQL password expiration.
 2017-08-22 12:14:53 -06:00
Mike Place
46540dd08f Merge pull request #43004 from arthurlogilab/patch-22 
[sentry_returner] don't force transport config
 2017-08-22 10:48:48 -06:00
Mike Place
1e40bb1c08 Merge pull request #43106 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-08-22 09:32:35 -06:00
lomeroe
7a90ee6bbc lint fix 2017-08-22 09:53:07 -05:00
Daniel Wallace
ea9e6dfd73 Merge branch 'develop' into modularise-tokens 2017-08-22 08:49:55 -06:00
lomeroe
0c2683e66d track xml namespace to ensure policies w/duplicate IDs or Names do not 
conflict
 2017-08-22 09:05:34 -05:00
lomeroe
c5623b872f add additional checks for ADM policies that have the same ADMX policy ID 
(#42279)
 2017-08-22 09:05:34 -05:00
Dmitry Kuzmenko
2a9d4cb04d Don't fail on eauth if 'kwarg' not in load. 2017-08-22 16:15:29 +03:00
rallytime
67cdfd28ad Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/cli/cp.py
  - salt/modules/testinframod.py
  - salt/states/jenkins.py
  - tests/unit/utils/test_find.py
 2017-08-22 09:07:26 -04:00
Amir Pakdel
6f182c55ff Merge branch 'develop' into mssql_states 2017-08-22 08:56:06 -04:00
Dmitry Kuzmenko
7ec398eb72 Allow external_auth limit funs/args for runner/wheel modules. 
Example:
external_auth:
  pam:
    thatch:
      - '@runner':
        - 'mod.fun':
          args: ['a', 'b']
          kwargs:
            aa: bb
 2017-08-22 12:17:09 +03:00
Kunal Bajpai
319cc98a94 Fix lint failures 2017-08-22 14:15:57 +05:30
Kunal Bajpai
49a2d6d950 Add runner to sync eauth_token modules, fix masterapi daemon to use token module 2017-08-22 12:31:00 +05:30
Mike Place
f9b4976c02 Merge pull request #42996 from twangboy/win_fix_test_stateconf 
Fix `unit.test_stateconf` for Windows
 2017-08-21 16:43:58 -06:00
Mike Place
19fc644c9b Merge pull request #43024 from twangboy/win_unit_utils_test_find 
Fix `unit.utils.test_find` for Windows
 2017-08-21 16:38:09 -06:00
Mike Place
3940084df9 Merge branch 'develop' into postgres-valid-until 2017-08-21 16:16:18 -06:00
Mike Place
1a531169fc Merge pull request #43088 from gtmanfred/2017.7 
allow docker util to be reloaded with reload_modules
 2017-08-21 16:14:36 -06:00
Mike Place
a67db1be3c Merge pull request #43090 from mitodl/develop 
Fixed issue with silently passing all tests in Testinfra module
 2017-08-21 16:06:48 -06:00
Mike Place
83e528f0b3 Merge pull request #43091 from mitodl/2017.7 
Fixed issue with silently passing all tests in Testinfra module
 2017-08-21 16:06:21 -06:00
Mike Place
b071384611 Merge pull request #42977 from redmatter/fix-broken-docker-network-create 
Remove check_duplicates from create_network call
 2017-08-21 15:59:50 -06:00
Mike Place
5482524270 Merge pull request #41994 from twangboy/win_unit_test_cmdmod 
Fix `unit.modules.test_cmdmod` on Windows
 2017-08-21 15:53:01 -06:00
Mike Place
f48b6a14d5 Merge pull request #42988 from thusoy/fix-iptables-negation 
Fix broken negation in iptables
 2017-08-21 15:00:13 -06:00
Mike Place
b33c4abc15 Merge pull request #42933 from garethgreenaway/42873_2017_7_osquery_fix 
Fixes to osquery module
 2017-08-21 14:48:30 -06:00
Mike Place
7c6ec8314a Merge pull request #42799 from wojciechwroblewski/feature-etcd_mod-parameters 
feature: override etcd_mod parameters using kwargs
 2017-08-21 14:40:02 -06:00
Mike Place
73e88af555 Merge pull request #43062 from rallytime/stale-config-update 
Reduce the number of days an issue is stale by 15
 2017-08-21 14:22:58 -06:00
Mike Place
53c2115769 Merge pull request #43093 from gtmanfred/ec2 
Fix ec2 list_nodes_full to work on 2017.7
 2017-08-21 14:21:21 -06:00
Mike Place
ddaffff439 Merge branch 'develop' into patch-22 2017-08-21 14:19:06 -06:00
Daniel Wallace
373a9a0be4 allow docker util to be reloaded with reload_modules 
If we reference the actual import, the utils module won't be reloaded, but if
we use `__utils__` it can be reloaded on a pip install
 2017-08-21 13:18:08 -06:00
Amir Pakdel
62d256ac59 Merge branch 'develop' into mssql_states 2017-08-21 14:48:40 -04:00
Mike Place
32f9ade4db Merge pull request #43087 from rallytime/bp-42174 
Back-port #42174 to 2017.7
 2017-08-21 12:40:17 -06:00
Daniel Wallace
c7cffb5a04 This block isn't necessary 
If a location isn't passed to list_nodes_full, we can just use get_location().
Of no location is set in the provider, it will just use get_location().

The problem with the lookup if there are profiles, is the way that the
provider/driver was changed in the last release, if it just uses the profile
directly, it will fail when trying to do a full list.

Then for multiple locations being called, each provider has to have a location
in it, and will be called once, as it stands now, if you have multiple
providers, minions from each provider could be doubled up with this lookup.

This change should meet all the needs that this if statement was added for, and not fail in 2017.7
 2017-08-21 11:49:21 -06:00
Daniel Wallace
b7283bcc6f _vm_provider_driver isn't needed anymore 
We deprecated some of these names in 2017.7, and this function is no longer
needed
 2017-08-21 11:49:20 -06:00
Tobias Macey
b502560e61
Fixed issue with silently passing all tests in Testinfra module 
The Testinfra module had a line where the collection of passed arguments was silently overwritten so that it would not actually perform any assertions. Updated the variable names to address the issue of the parameters being clobbered so that asertions are performed properly.
 2017-08-21 13:34:10 -04:00
Tobias Macey
980b60c1a9
Fixed issue with silently passing all tests in Testinfra module 
The Testinfra module had a line where the collection of passed arguments was silently overwritten so that it would not actually perform any assertions. Updated the variable names to address the issue of the parameters being clobbered so that asertions are performed properly.
 2017-08-21 13:30:59 -04:00
garethgreenaway
882fcd846f Merge pull request #43029 from terminalmage/fix-func-alias 
Normalize the salt caching API
 2017-08-21 09:54:58 -07:00
Michael Calmer
cf6563645b add support for certificate authentication to kubernetes module 2017-08-21 10:46:29 -04:00
Nicole Thomas
dbee735f6e Merge pull request #43039 from gtmanfred/kube 
catch ImportError for kubernetes.client import
 2017-08-21 10:32:37 -04:00
Nicole Thomas
c56a8499b3 Merge pull request #43058 from rallytime/fix-release-num 
Update release version number for jenkins.run function
 2017-08-21 10:13:34 -04:00
Nicole Thomas
c3229d489d Merge pull request #43066 from SaltyCharles/patch-8 
fix typos in boto_vpc
 2017-08-21 09:15:32 -04:00
SaltyCharles
4d6b94f975 fix typos in boto_vpc 2017-08-18 14:43:36 -07:00