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
56,553 Commits 24 Branches 182 Tags 341 MiB
ce0942117d
Commit Graph

56553 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
rallytime
ce0942117d Convert a couple more functions to be able to use salt-cloud command in Linode driver 2015-08-18 16:45:56 -06:00
rallytime
6e781bc8c0 Refactor a few linode functions to be useful with salt-cloud command 2015-08-18 13:11:23 -06:00
Joseph Hall
acf450e35f Merge pull request #26346 from TronPaul/s3-sec-token 
Fix s3 using IAM credentials
 2015-08-15 10:18:20 -06:00
Mark McGuire
88bd1438b3 Fix s3 using IAM credentials 
- pass `salt.utils.aws.IROLE_CODE` as the access_key and secret_key
  to `salt.utils.aws.sig4` so that sig4 grabs the full IAM
  credentials when it calls `creds`
 2015-08-15 09:09:19 -05:00
Justin Findlay
2184ac1f81 Merge pull request #26331 from mnalt/fix_sysrc_empty_variables 
fix bug in sysrc to allow for empty rc variables
 2015-08-14 15:21:13 -06:00
C. R. Oldham
aeb1b0eac7 Merge pull request #26334 from rallytime/fix-26310 
Call salt.utils.cloud.bootstrap in GCE Driver provisioning
 2015-08-14 13:39:32 -06:00
rallytime
78c8468c54 Return full information of VM creation 2015-08-14 12:54:16 -06:00
rallytime
6ae7524744 Call salt.utils.cloud.bootstrap in GCE Driver provisioning 
Fixes #26310
 2015-08-14 12:44:09 -06:00
Martin Alt
6c5f0e6b9e fix bug in sysrc to allow for empty rc variables 
/etc/defaults/rc.conf containes empty variables, e.g. cloned_interfaces.
sysrc will return something like
'cloned_interfaces: '
such empty variables would raise an exception. Fixed by checking for
empty variables.
 2015-08-14 19:11:39 +02:00
Justin Anderson
81377ec710 Merge pull request #26308 from dmurphy18/dgm_envfix 
Support for environment overrides building packages
 2015-08-14 09:13:00 -06:00
David Murphy
823db50f95 Support for environment overrides building packages 2015-08-13 16:56:53 -06:00
Seth House
c60452715b Merge pull request #26279 from TheScriptSage/add-api-acl 
Merge changes for pull#26083 and pull#25632 into 2015.8
 2015-08-12 20:50:37 -06:00
Robert Davis
4e1d978b2f Merge changes for pull#26083 and pull#25632 into 2015.8 2015-08-12 17:45:02 -07:00
Justin Findlay
4cf9a16e63 Merge pull request #26224 from cachedout/fopen_2015_8 
Cleanup of a few cases to move to salt.utils.fopen
 2015-08-12 14:15:49 -06:00
Nicole Thomas
ba15691abb Merge pull request #26260 from nmadhok/doc-fix-2015.8 
Correct spelling of integration in docs
 2015-08-12 12:14:30 -06:00
Mike Place
35d6ae2be7 Use with 2015-08-12 12:14:12 -06:00
Nitin Madhok
264f3bf656 Correct spelling of integration in docs 2015-08-12 13:27:30 -04:00
Thomas S Hatch
7c501f8a7b Merge pull request #26226 from rallytime/fix-25463 
Fix #25463
 2015-08-12 11:04:11 -06:00
Nicole Thomas
6730990bbc Merge pull request #26248 from nmadhok/vmware-cloud-test-2015.8 
Initial commit of unit tests for vmware cloud driver
 2015-08-12 10:59:15 -06:00
Colton Myers
47f56a7db7 Merge pull request #26228 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-08-12 10:16:06 -06:00
Colton Myers
1c661abc91 Skip failing event tests 
@driskell it would be great if you could fix these up when you do your
2015.8 refactor
 2015-08-12 10:15:11 -06:00
rallytime
71f1c3fd34 Provide a more accurate error message. 2015-08-12 09:26:53 -06:00
Nicole Thomas
90943ef847 Merge pull request #26244 from nmadhok/vmware-cloud-driver-additions-2015.8 
Backport additions to VMware cloud driver from develop to 2015.8 branch
 2015-08-12 08:53:57 -06:00
Nitin Madhok
fd7c365999 Lint Fix 2015-08-12 10:48:10 -04:00
Nitin Madhok
7c33f0ad54 Initial commit of unit tests for vmware cloud driver 2015-08-12 10:33:42 -04:00
Justin Findlay
7576193b4b Merge pull request #26235 from sjorge/smartos-utils-helper 
salt.utils.is_smartos_zone, inverse of is_smartos_globalzone
 2015-08-12 08:27:15 -06:00
Nitin Madhok
dd02e0a967 Backport additions to VMware cloud driver from develop to 2015.8 branch 2015-08-12 10:07:05 -04:00
Jorge Schrauwen
483de86df5 salt.utils.is_smartos_zone, inverse of is_smartos_globalzone, inversint it with not could give errorous results. 2015-08-12 07:14:30 +00:00
Colton Myers
426b1631c6 Remove stray subscribe 2015-08-11 23:12:18 -06:00
Colton Myers
a7fcc49911 connect_pub call replaces subscribe call 2015-08-11 23:10:47 -06:00
Colton Myers
4e35a0ee01 Use list comp instead of filter (py3 compat) 2015-08-11 23:02:09 -06:00
Colton Myers
1502a39779 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    conf/minion
    salt/client/__init__.py
    salt/states/dockerio.py
    salt/utils/event.py
    tests/unit/utils/event_test.py
 2015-08-11 18:12:21 -06:00
rallytime
49352725c6 Make error message more polite. 2015-08-11 17:05:48 -06:00
rallytime
ac12bde29d Provide more helpful error instead of stacktracing if service isn't running 
Fixes #25463
 2015-08-11 16:59:41 -06:00
rallytime
92eba02485 Escape \ in CLI Examples 2015-08-11 16:52:59 -06:00
Mike Place
229a0cef7b Move local transport to fopen (just for consistency) 2015-08-11 16:07:32 -06:00
Mike Place
c68a537309 Move pkgrepo to fopen 2015-08-11 16:05:24 -06:00
Mike Place
d4d7326101 Move file state to fopen over open 2015-08-11 16:05:08 -06:00
Mike Place
0b63baa5d1 Move loader to fopen 2015-08-11 16:05:00 -06:00
Mike Place
9b68f9df0a Migrate btmp beacon to fopen 2015-08-11 16:01:19 -06:00
Mike Place
b5980ca54a Migrate wtmp beacon to fopen 2015-08-11 15:57:04 -06:00
Mike Place
1492a14ea5 Merge pull request #26221 from sjorge/smartos-grains 
SmartOS grain fixes
 2015-08-11 15:45:14 -06:00
Jorge Schrauwen
22acfa1320 fix ip adres issues on SunOS/SmartOS 2015-08-11 20:59:19 +00:00
Mike Place
8e992f23d0 Merge pull request #26218 from terminalmage/issue4699 
Add warning about file.recurse unicode errors with vim swap files.
 2015-08-11 14:21:08 -06:00
Erik Johnson
9c155e0c1a Add warning about file.recurse unicode errors with vim swap files. 
Fixes #4699.
 2015-08-11 15:16:44 -05:00
Jorge Schrauwen
06df3ef7c1 SunOS should use isainfo to figureout osarch. 
Info from isainfo manpage
       -k
             Prints the name of the instruction set(s) used by the
operating
             system kernel components such as device drivers and STREAMS
             modules.
 2015-08-11 18:36:11 +00:00
Justin Findlay
d69f50e848 Merge pull request #26214 from rallytime/bp-24878 
Back-port #24878 to 2015.8
 2015-08-11 12:27:59 -06:00
Jorge Schrauwen
749cc419ec Just skip the smbios stuff on SmartOS regardless, even if smbios works 
in the global zone, it is not compatible!

Usage: smbios [-BeOsx] [-i id] [-t type] [-w file] [file]

        -B disable header validation for broken BIOSes
        -e display SMBIOS entry point information
        -i display only the specified structure
        -O display obsolete structure types
        -s display only a summary of structure identifiers and types
        -t display only the specified structure type
        -w write the raw data to the specified file
        -x display raw data for structures
 2015-08-11 18:23:30 +00:00
Jorge Schrauwen
ccd400a2f6 skip smbios grains on SmartOS when inside a zone 2015-08-11 18:14:17 +00:00
Jorge Schrauwen
cf74e49fca tweak smartos release info 2015-08-11 17:49:34 +00:00