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,210 Commits 24 Branches 182 Tags 341 MiB
38e40d4492
Commit Graph

67210 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
rallytime
0d8fd0605d Pylint fixes for develop branch 2016-03-10 11:00:58 -07:00
rallytime
2a0240702c Lint fix for #31761 2016-03-10 10:33:08 -07:00
Kris Raney
bae454625f Add boto_elasticsearch_domain module 2016-03-10 09:55:56 -06:00
Kris Raney
4611a9c570 Merge branch 'develop' into boto_vpc 
Conflicts:
	salt/modules/boto_vpc.py
	salt/states/boto_vpc.py
 2016-03-09 18:58:11 -06:00
Nicole Thomas
538ec983f7 Merge pull request #31724 from pakdel/develop 
subnetname and securitygroupname support for EC2
 2016-03-09 16:39:51 -07:00
Nicole Thomas
b7289d99f0 Merge pull request #31715 from giannello/vpc_peering_connections 
Add basic support for creating VPC routes
 2016-03-09 16:35:46 -07:00
Nicole Thomas
68cfc5c883 Merge pull request #31769 from DylanFrese/22142 
Fix acl.present and acl.absent when adding default ACLs
 2016-03-09 11:27:36 -07:00
Andreas Lutro
170742f861 update tests with new changes structure 2016-03-09 19:16:40 +01:00
Andreas Lutro
410b1835bc rename key for diff in changes dict 2016-03-09 19:10:06 +01:00
Andreas Lutro
41ea97628b switch changes-enabled to show old/new 2016-03-09 19:09:43 +01:00
Andreas Lutro
a3608841ec add comment when script is to be updated in test mode 2016-03-09 19:04:36 +01:00
Andreas Lutro
500f69c2dd just make tick_script arg required 2016-03-09 18:55:56 +01:00
Nicole Thomas
48a787bdb0 Merge pull request #31727 from rallytime/merge-develop 
[develop] Merge forward from 2016.3 to develop
 2016-03-09 10:55:53 -07:00
Andreas Lutro
530397924a correct versionadded 2016-03-09 18:52:45 +01:00
Dylan Frese
71d48a489a
Fix acl.present/acl.absent changing default ACLs 
The behaviour of the acl.present and acl.absent is to check the data
structure returned by getfacl contains a key by the name of acl_type.

However, this data structure does not contain any default ACLs if none
exist, so this check will fail. We omit the check if a default ACL was
passed into the state functions.

Unfortunately, the call to modfacl may fail if the user passes in an
acl_type such as 'default:random'. In this case the state will appear to
succeed, but do nothing.

This fixes the state module to allow setting default ACLs on files which
have none.
 2016-03-09 08:50:14 -06:00
Dylan Frese
f3139d001a
Handle empty acl_name in linux_acl state 
Calls to setfacl interpret an empty group or user name to mean to be the
owner of the file they're operating on. For example, for a directory
owned by group 'admin', the ACL 'default:group::rwx' is equivalent to
'default:group:admin:rwx'.

The output of the getfacl execution module returns ACLs in the format of
'group:admin:rwx' instead of 'group::rwx'. This commit changes the
acl.present state to look for the owner of the file if the acl_name
paremeter is empty.
 2016-03-09 08:07:18 -06:00