Commit Graph

57056 Commits

Author SHA1 Message Date
Pedro Algarvio
71928f2194 Prefer HTTPS, fix url argument 2015-08-17 19:48:00 +01:00
Pedro Algarvio
7b25430cc7 Download the necessary DLLs for windows 2015-08-17 19:48:00 +01:00
Pedro Algarvio
86692a92cd Install PyCrypto from a wheel in repo.saltstack.com under Windows 2015-08-17 19:48:00 +01:00
Pedro Algarvio
915da594c2 Skip M2Crypto in Windows.
Wwe're installing M2CryptoWin{32,64} which comes compiled
2015-08-17 19:48:00 +01:00
Pedro Algarvio
1ea426e299 Move code to properly handle default requirements.
Refs #26305
2015-08-17 19:48:00 +01:00
Pedro Algarvio
8fda8c0db3 M2CryptoWin{32,64} should only be installed on Salt < 2015.8.0 2015-08-17 19:48:00 +01:00
Pedro Algarvio
0ff2f19aee Override the develop command in cmdclass 2015-08-17 19:47:59 +01:00
Pedro Algarvio
a5aa752a85 Override the develop command when WITH_SETUPTOOLS is set 2015-08-17 19:47:59 +01:00
Pedro Algarvio
4d6841c761 Install M2CryptoWin{32,64} while installing Salt 2015-08-17 19:47:59 +01:00
Mike Place
709499438b Merge pull request #26386 from jahamn/fix-autosign_timeout
Fixes autosign_timeout usage in check_autosign_dir
2015-08-17 12:34:40 -06:00
David Boucha
8d901d7b15 Merge pull request #26328 from twangboy/fix_25562
Removed salt-master role requirement
2015-08-17 12:30:17 -06:00
TheBigBear
a232bad9c2 Update win_pkg.py 2015-08-17 19:22:28 +01:00
Florian Ermisch
18567e824d Only strip "/v2", not any char in "v2" from endpt
Sorry @whytewolf
2015-08-17 20:20:29 +02:00
David Murphy
a7a5d740fe Added option parameters to make_repo to allow for configuration settings
Added optional partameters to allow for key and option setting when
creating a repo, esp. Debian.  Note use of passphrases in options
requires the use of gpg-agent or similar with previously cached
passphrase
2015-08-17 12:17:18 -06:00
TheBigBear
a013bb5b3d minor edit 2015-08-17 11:53:05 -06:00
Daniel Wallace
d26dc62c7c use the same quotes as the join 2015-08-17 11:51:48 -06:00
Julien Cigar
f0bc3765d9 No logging should happen on __virtual__ 2015-08-17 11:49:13 -06:00
Julien Cigar
ca406eaf3c proposed fix for #26155 2015-08-17 11:49:13 -06:00
rallytime
b4f1fc3da7 Pylint fix 2015-08-17 11:47:10 -06:00
Mike Place
74558f5743 Merge pull request #26362 from garethgreenaway/2015_5_26327_more_invisible_mount_options
Fixes to mount state.
2015-08-17 11:44:55 -06:00
Nicole Thomas
7dbbd90c98 Merge pull request #26379 from s0undt3ch/issues/backport-26353
[2015.5] Backport #26353
2015-08-17 11:19:28 -06:00
Jason Hamner
b2fa2ac9d3 Fixes autosign_timeout usage in check_autosign_dir
Fixes #24334
2015-08-17 11:00:25 -06:00
Daniel Wallace
a14bcef054 don't require volume endpoint in nova driver
fixes #25955
2015-08-17 12:00:23 -05:00
rallytime
211f6feaf5 Fix test failures - get_attributes shouldn't be called if none are provided 2015-08-17 10:58:44 -06:00
TheBigBear
6221e69c14 Fix shell quoting for cmd.run
In my tests this fixed issue saltstack#26114 , maybe somebody needs to test for regressions? re-submitted against 2015.8 branch as requested by @twangboy
2015-08-17 17:47:04 +01:00
rallytime
f2896c0877 Allow the creation of a VM without a profile
Fixes #26369
2015-08-17 10:41:05 -06:00
Bastiaan Bakker
ec8d4b0470 test wether RETVAL is 0 with -eq rather than =. 2015-08-17 17:20:33 +02:00
Loren Carvalho
33ed315c85 fixed Packaing -> Packaging typo and added a couple comments on the setuptools/distutils abstract methods 2015-08-17 15:33:51 +01:00
Pedro Algarvio
a73ca74bc3 White-space lint fix 2015-08-17 15:28:22 +01:00
Justin Findlay
ef4dbd8b16 Merge pull request #26347 from 0xf10e/allow_pkgng_on_fbsd9
Load 'pkgng' as 'pkg' on FreeBSD 9 when `providers:pkg` == 'pkgng'
2015-08-17 08:26:06 -06:00
Pedro Algarvio
8f69530f65 Add the unit tests for Schema in a DictItem properties 2015-08-17 13:20:18 +01:00
Pedro Algarvio
cb2aaa876c Handle Schema items 2015-08-17 13:19:04 +01:00
Pedro Algarvio
fa826c9ba2 Add a validation test for DictItem required attribute validation 2015-08-17 13:58:22 +01:00
Pedro Algarvio
f74cc21d70 DictItem must also define it's require attribute 2015-08-17 13:56:00 +01:00
Pedro Algarvio
a0af17dbde Double to single quotes 2015-08-17 13:54:12 +01:00
Bastiaan Bakker
a83a5de41e fix issue #26161: on RedHat family systems touch /var/lock/subsys/$SERVICE to ensure the daemon will be stopped on shutdown. 2015-08-17 11:11:12 +02:00
Joseph Hall
6c243b1557 Merge pull request #26361 from TronPaul/aws-sec-token
sign security token
2015-08-16 11:42:13 -06:00
Gareth J. Greenaway
6fe9b64554 Some mount options are translated to different options once a share has been mounted, eg. when specifying a protocol for NFS as either tcp or udp this option is translated into either proto=tcp or proto=udp. Change adds a lookup dictionary for these options so that a re-mount isn't forced each time. #26327 2015-08-16 08:19:18 -07:00
Gareth J. Greenaway
cf532d46dd Some mount options are translated to different options once a share has been mounted, eg. when specifying a protocol for NFS as either tcp or udp this option is translated into either proto=tcp or proto=udp. Change adds a lookup dictionary for these options so that a re-mount isn't forced each time. 2015-08-16 08:15:05 -07:00
Mark McGuire
2a2b49d52d sign security token 2015-08-16 10:00:12 -05:00
0xf10e
9d18265948 remove redundant backslashes 2015-08-15 20:41:05 +02: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
0xf10e
ef4a9f9a93 don't load freebsdpkg when providers:pkg == 'pkgng' 2015-08-15 18:08:11 +02:00
0xf10e
00cd8524da actually load pkgng when providers:pkg == "pkgng" 2015-08-15 18:07:43 +02: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
rallytime
d8ad023e88 Don't call boto_elb._attributes_present if no attributes were provided
Refs #16049
2015-08-14 15:47:53 -06:00
Florian Ermisch
f61358d26b get rid of a pylint-warning 2015-08-14 23:21:25 +02: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
Florian Ermisch
ac8b49174b Always remove trailing "v2" from Glance endpoint 2015-08-14 22:56:59 +02:00
Florian Ermisch
1a90fb7465 fix authentication when keystone.token is defined 2015-08-14 22:49:51 +02:00