valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
67,227 Commits 24 Branches 182 Tags 341 MiB
f35413dc9e
Commit Graph

67227 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Saravana Periyasamy
f35413dc9e #31899: Added the identifier parameter to get_records, update_records & delete_records, and returned the identifier as part of the ret['changes']. 2016-03-15 14:21:34 -05:00
Mike Place
3a0f1f69b3 Merge pull request #31898 from afletch/patch-1 
Ensure rh_service not used on CloudLinux 7
 2016-03-15 12:47:19 -06:00
Nicole Thomas
80feff9596 Merge pull request #31896 from cachedout/doc_31794 
Add docs for master_tries
 2016-03-15 10:01:21 -06:00
afletch
4300266374 Ensure rh_service not used on CloudLinux 7 
Add CloudLinux to RHEL-derived distros excluded from rh_service use in osrelease >= 7
 2016-03-15 15:42:45 +00:00
Mike Place
64ca65954a Add docs for master_tries 
Refs #31794
 2016-03-15 09:29:13 -06:00
Mike Place
8f1ceb7eda Merge pull request #31794 from skizunov/develop2 
Add `master_tries` config option for minions
 2016-03-15 09:24:49 -06:00
Mike Place
908b4446b0 Merge pull request #31808 from lyft/reenable-disabled-user 
Allow for users to set expiration date of -1.
 2016-03-14 16:29:12 -06:00
Nicole Thomas
3702e7aff0 Merge pull request #31876 from gtmanfred/develop 
OS-EXT-IPS:type is not always defined on addresses
 2016-03-14 14:00:16 -06:00
Daniel Wallace
aef4978a6f default floating_ip config should be a dict 2016-03-14 12:24:52 -06:00
Nicole Thomas
a552634123 Merge pull request #31809 from preoctopus/develop 
Remove getval as it's deprecated
 2016-03-14 12:15:31 -06:00
Nicole Thomas
2379247b2a Merge pull request #31875 from cachedout/remove_mine_tests 
Remove useless mine tests
 2016-03-14 12:15:04 -06:00
Daniel Wallace
90fe817bde OS-EXT-IPS:type is not always defined on addresses 
In novaclient servers
 2016-03-14 12:04:25 -06:00
Mike Place
38e40d4492 Merge pull request #31798 from mchugh19/patch-1 
Create salt-proxy instantiated service file
 2016-03-14 11:52:05 -06:00
Mike Place
8e540af197 Remove useless mine tests 
These are so heavily mocked that they test nothing.
 2016-03-14 11:35:42 -06:00
Nicole Thomas
af491363bf Merge pull request #31872 from kraney/boto_iam 
Fix buggy state updates to attached user/group/role policies.
 2016-03-14 11:29:06 -06:00
Mike Place
b63edcd01a Merge pull request #31870 from gtmanfred/develop 
specify defaults for reactor in salt/config
 2016-03-14 11:19:48 -06:00
Kris Raney
002f9c8002 Fix buggy state updates to attached user/group/role policies. 
Was always running whether needed or not. Also, failed for some ways of specifying credentials.
 2016-03-14 11:35:11 -05:00
Mike Place
5bcd923589 Merge pull request #31868 from mirceaulinic/CF-NAPALM-NET 
Better documentation and more functions for NAPALM proxy and NAPALM_NET module
 2016-03-14 10:29:14 -06:00
Daniel Wallace
849e269a75 specify defaults for reactor in salt/config 2016-03-14 09:50:54 -06:00
Nicole Thomas
86a3fc24ef Merge pull request #31838 from lomeroe/boto_vpc-subnet_present-route_table 
allow boto_vpc.subnet_present state to manage a subnet's explicitly associated route table
 2016-03-14 09:39:18 -06:00
Thomas S Hatch
88b8a0980c Merge pull request #31807 from gtmanfred/develop 
Add reactor as an engine
 2016-03-14 09:29:33 -06:00
Mircea Ulinic
439acb6562 Added facts() and environment() 2016-03-14 14:56:31 +00:00
Mircea Ulinic
75ee83fe58 Better documentation and more functions 2016-03-14 14:22:42 +00:00
Ethan Moore
b46ae0a172 kwarg updates 2016-03-12 01:54:59 +00:00
Ethan Moore
7dcfda854e updates to propertly catch changes 2016-03-11 23:02:49 +00:00
Ethan Moore
fb7467cb2a add functionality to manage subnet route table association with subnet_present state 2016-03-11 20:02:02 +00:00
Daniel Wallace
17c22e7374 Use the reactor engine on the master 
Don't start it as a seperate process, just use the engine.

Also include a default engines dict in the master config
 2016-03-11 11:46:59 -07:00
Nicole Thomas
846e178d7e Merge pull request #31820 from mchugh19/nspawn_bootstrap_ubuntu 
Nspawn bootstrap ubuntu
 2016-03-11 10:21:22 -07:00
Christian McHugh
b6ce73c5a7 correct indenting 2016-03-11 10:36:25 -06:00
Nicole Thomas
db6194df88 Merge pull request #31819 from mchugh19/unsupported-nspawn-distro 
raise error on unsupported distro
 2016-03-11 09:32:17 -07:00
Nicole Thomas
4147ff2599 Merge pull request #31805 from john5223/develop 
Include btrfs as specialFS to match on name for set_fstab
 2016-03-11 08:59:46 -07:00
Nicole Thomas
cce0af9a2e Merge pull request #31792 from kraney/boto_elasticsearch 
Add boto_elasticsearch_domain module
 2016-03-11 08:57:27 -07:00
Nicole Thomas
e6d5d48845 Merge pull request #31726 from kraney/boto_vpc 
Add NAT Gateway support to boto_vpc
 2016-03-11 08:39:56 -07:00
Daniel Wallace
197fc2b58d Add reactor to engines 
For use with the event bus on minions.

Closes #15265
 2016-03-11 08:34:16 -07:00
Christian McHugh
75a3c166ad revert unrelated change 2016-03-11 09:30:37 -06:00
Christian McHugh
3bf25dd104 support ubuntu in nspawn.bootstrap_container 2016-03-11 09:25:57 -06:00
Christian McHugh
1f6e42977c raise error on unsupported distro 2016-03-11 09:17:00 -06:00
Kris Raney
b0f0601bfc More pylint fun 2016-03-10 21:02:06 -06:00
Kris Raney
3bcca37d80 Ah, pylint. Equal parts useful and annoying. 2016-03-10 20:57:03 -06:00
Kris Raney
bc18efc1cc Updates were no-ops 2016-03-10 20:54:49 -06:00
Polite Octopus
aceaaa0e2f Remove getval as it's deprecated 2016-03-10 20:58:19 -05:00
Vivian Ho
168489d684 Allow the deletion of an expiration on a user after they previously have an expiration set 2016-03-10 16:04:16 -08:00
Kris Raney
70b9860b1a Fix pylint, doctstring, and tests in the case that boto3 is not installed 2016-03-10 17:09:52 -06:00
Kris Raney
15675c78c8 Add boto3 requirement to boto_vpc unit tests 2016-03-10 17:03:10 -06:00
Kris Raney
4161a7e789 Merge branch 'develop' into boto_vpc 2016-03-10 17:02:08 -06:00
John Curran
e160e24822 Include btrfs as specialFS to match on name 2016-03-10 15:49:34 -06:00
Christian McHugh
4000e68356 Create salt-proxy instantiated service file 
Add a systemd service file for salt-proxy. 

Instantiate a new proxy service with proxyid=p8000:
# systemctl enable salt-proxy\@p8000.service
# systemctl start salt-proxy\@p8000.service
 2016-03-10 13:25:01 -06:00
Sergey Kizunov
4c58fb85a7 Disabled pylint warning 
I believe the pylint warning to be a false positive, so I disabled it
and added a comment explaining why.

Signed-off-by: Sergey Kizunov <sergey.kizunov@ni.com>
 2016-03-10 12:37:35 -06:00
Nicole Thomas
617fb0ce8f Merge pull request #31796 from rallytime/lint-develop 
Pylint fixes for develop branch
 2016-03-10 11:32:03 -07:00
Nicole Thomas
4e0b44a1bb Merge pull request #31795 from rallytime/lint-31761 
Merge #31761 with lint fix
 2016-03-10 11:01:25 -07:00