valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 17:33:54 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
82,000 Commits 24 Branches 182 Tags 341 MiB
dcadf12d4d
Commit Graph

82000 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Tom Williams
dcadf12d4d INFRA-4842 - update unit test to account for new test=True result 2017-05-18 18:04:01 -04:00
Tom Williams
ae074faa12 INFRA-4842 - boto_elb should return None when test=True and changes are pending... 2017-05-18 16:23:16 -04:00
Mike Place
529dbbe6bb Merge pull request #41213 from pcn/slack-client-features 
Slack client features
 2017-05-17 14:36:47 -05:00
Mike Place
4ed45d9dcc Merge pull request #41281 from alexbleotu/root_dir_prepend_fix-gh 
Root dir prepend fix gh #2
 2017-05-17 14:10:26 -05:00
Mike Place
bf7b0cce2f Merge pull request #41229 from Jille/develop 
Add support for ssh certificates to salt.modules.ssh.host_keys
 2017-05-17 14:09:56 -05:00
Mike Place
a16cfe2c10 Merge pull request #41246 from keesbos/catch-grain-mock-error 
Catch a possible error, especially triggered in unit tests
 2017-05-17 13:48:55 -05:00
Mike Place
9d9bf1c7f6 Merge pull request #41247 from mcdermj/develop 
JunOS: Change os_install to use get_file instead of get_template
 2017-05-17 13:46:15 -05:00
Mike Place
c51a6e4757 Merge pull request #41270 from isbm/isbm-minion-id-127-name-devel 
Bugfix: Unable to use "127" as hostname for the Minion ID (devel)
 2017-05-17 13:29:03 -05:00
Mike Place
1c3741eae1 Merge pull request #41284 from shengis/azurerm_load_balancers 
Add support for load balancers with AzureARM provider
 2017-05-17 13:24:58 -05:00
Mike Place
1d89454fd8 Merge pull request #41285 from kraney/boto_lambda_vpc_reset 
fix a bug in boto_lambda state where if VpcConfig is None or absent, …
 2017-05-17 11:55:58 -05:00
Mike Place
eecf2a81b7 Merge pull request #41288 from liquidgecka/develop 
Only deal with integer bits in win_service.py.
 2017-05-17 11:54:36 -05:00
Mike Place
f56c634458 Merge pull request #41290 from mcdermj/junos-proxy-alive 
JunOS:  Add alive function to proxy
 2017-05-17 11:48:46 -05:00
Mike Place
e3b0d5cd17 Merge pull request #41292 from rallytime/merge-develop 
[develop] Merge forward from nitrogen to develop
 2017-05-17 11:48:26 -05:00
Mike Place
36269d2601 Merge pull request #41295 from shengis/azurerm_availability_set 
Add support for availibility_set
 2017-05-17 11:37:34 -05:00
Mike Place
ecaf7dde5d Merge pull request #41297 from defanator/boto_vpc_route_table_present_test_fix 
boto_vpc.route_table_present: avoid exception in testing mode
 2017-05-17 11:35:57 -05:00
Mike Place
3d10884578 Merge pull request #41301 from lomeroe/fix_41291 
properly convert packed string to decimal values
 2017-05-17 11:33:07 -05:00
Alexandru Bleotu
00d0c37e0a Fixed prepend logic #2 2017-05-17 17:21:15 +01:00
Alexandru Bleotu
f5af299240 pylint fixes 2017-05-17 17:21:15 +01:00
Alexandru Bleotu
513254678f Fixed tests in test_api to not have a side-effect of changing the salt.config.DEFAULT_API_OPTS array 2017-05-17 17:21:15 +01:00
Alexandru Bleotu
8a83de6b43 Fixes to prepend logic 2017-05-17 17:21:15 +01:00
Alexandru Bleotu
4737b0d4fd Added test to prevent errors when the config root path includes the default root path 2017-05-17 17:21:15 +01:00
Alexandru Bleotu
93eb3fc9d4 Fixed the prepend logic of the root_dir to relative config paths 2017-05-17 17:21:14 +01:00
Alexandru Bleotu
4f3b06dfb8 Added private function to adjust the log_file path if there is a log_dir override 2017-05-17 17:21:14 +01:00
lomeroe
b8eeadbd96 properly convert packed string to decimal values 2017-05-17 08:07:13 -05:00
Andrei Belov
1eb81a22d4
boto_vpc.route_table_present: avoid exception in testing mode 
When there is an attempt to create new (non-existent) route table
with boto_vpc.route_table_present and testing mode is turned on,
the "list index out of range" exception is being throw in
_routes_present().
 2017-05-17 14:54:19 +03:00
Aurélien FUSIL-DELAHAYE
f7252151a1 Add support for availibility_set 
documentation added
 2017-05-17 11:50:31 +02:00
Aurélien FUSIL-DELAHAYE
20d403f78d Fix lint for azurerm lb 2017-05-17 11:06:48 +02:00
Bo Maryniuk
5f01e748e0 Fix Lint 2017-05-17 08:42:38 +02:00
rallytime
9668480fc5 Merge branch 'nitrogen' into 'develop' 
No conflicts.
 2017-05-16 19:58:21 -06:00
Nicole Thomas
5e24e6ad86 Merge pull request #41258 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-16 19:56:58 -06:00
Jeremy McDermond
10e51e4367 JunOS: Add alive function to proxy 
New in Nitrogen is a proxy_keep_alive option to poll the connection
periodicaly to keep it alive.  This is predicated on having an alive function
in the proxy code to see if the connection still exists.  This code
implements the alive function so that the proxy_keep_alive can work.
 2017-05-16 16:15:24 -07:00
Mike Place
0a22df3252 Merge pull request #41275 from cloudflare/px_keepalive_opt 
Adding keepalive optional arg for NAPALM always alive minions
 2017-05-16 17:35:51 -05:00
Brady Catherman
52879fc57d Only deal with integer bits in win_service.py. 
Since SERVICE_TYPE is a dictionary that contains integer, and string
keys it is not possible to perform a bitmask on the key values in
win_service.py. This make sure that this logic only runs on integer
keys.
 2017-05-16 15:31:51 -07:00
Mike Place
8f9ed2be5a Merge pull request #41280 from shorawitz/patch-4 
Update boto_cfn.py
 2017-05-16 17:20:50 -05:00
Winston Liu
a96e431717 fixed unit test failures. 2017-05-16 15:09:00 -07:00
rallytime
76714d116b Mock calls to salt.utils.pkg.clear_rtag call in aptpkg unit tests 2017-05-16 16:00:37 -06:00
rallytime
8e1db7c427 Pylint fix 2017-05-16 15:53:11 -06:00
Nicole Thomas
1e78c3c2ba Merge pull request #41259 from rallytime/follow-up-41245 
Remove doc ref files for search runner
 2017-05-16 15:50:38 -06:00
Nicole Thomas
52d62efa33 Merge pull request #41262 from rallytime/minor-doc-fixes 
Fix a couple of doc references for code-block highlighting
 2017-05-16 15:24:45 -06:00
Nicole Thomas
ded62babe2 Merge pull request #41253 from rallytime/update-permersionerror 
Use python 2 compatible error numbers instead of PermissionError
 2017-05-16 15:23:51 -06:00
Aurelien Fusil-Delahaye
495e848dad Documentation for load-balancer 2017-05-16 23:22:40 +02:00
Winston Liu
a5c1488caf fix a bug in boto_lambda state where if VpcConfig is None or absent, the previous VpcConfig is not getting cleared away. 2017-05-16 13:34:32 -07:00
Peter C. Norton
115030f867 This was in the wrong place 2017-05-16 15:51:57 -04:00
Aurélien FUSIL-DELAHAYE
c4ad0eafe7 Add support for load balancers 2017-05-16 20:06:55 +02:00
David Christensen
1778cf7c94 Update boto_cfn.py 
Added ability to return "tags" and "parameters" from Amazon Cloud Formation
 2017-05-16 09:03:22 -07:00
Jeremy McDermond
40eef0c0e3 JunOS: Fix whitespace for PEP compliance 2017-05-16 08:21:16 -07:00
Erik Johnson
12a768fd91 Merge pull request #41251 from abednarik/update_apt_hold_docs 
Update apt module regarding upgrade against hold packages.
 2017-05-16 09:38:54 -05:00
Bo Maryniuk
2a60eae826 Add unit test for hostname can be started from 127 2017-05-16 16:21:31 +02:00
Bo Maryniuk
61801a5440 Harden to 127. IP part 2017-05-16 16:21:23 +02:00
Mircea Ulinic
d33f3775ab Adding keepalive optional arg 
And default to 5 seconds when running inside a always alive proxy
minion. This prevents the SSH disconnection when the communication
with the remote network device is established through a NAT,
firewall etc. which tears down the session after a specific time.
Defaulting to 5 seconds when not explicitly set, the user does
not need to do anything else on their side.
This, in combination with the new proxy keepalive mechanism
should prevent annoying issues when the minion is not
available.
 2017-05-16 13:31:19 +00:00