valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
23,533 Commits 24 Branches 182 Tags 341 MiB
05277cfd32
Commit Graph

23533 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Cowyn Li
510ded748c A new approach for working with fileserver backend for git_pillar module 2013-12-05 23:40:45 +08:00
Matt Hopkins
edad7246df Fix for unknown version numbers when installing windows packages 2013-12-05 10:23:40 -05:00
Olaf Lenz
b4de47d524 Fix to #8816 2013-12-05 16:19:39 +01:00
Olaf Lenz
d69c9de302 Add parameter "backupname" to file.symlink. 2013-12-05 15:53:11 +01:00
Cowyn Li
c24852c9f4 Merge remote-tracking branch 'upstream/develop' into develop 2013-12-05 22:51:19 +08:00
Olaf Lenz
4c3b91df50 If a specific repo is requested, force the instalation. Otherwise, zypper asks interactively whether the vendor is to be changed. 2013-12-05 14:57:33 +01:00
Joseph Hall
17ca2aeac2 Merge pull request #9024 from cachedout/#8976 
Grains detection for LXC and fix error in disk.usage under Docker
 2013-12-05 04:34:15 -08:00
Joseph Hall
ee06057dc7 Merge pull request #9025 from terminalmage/issue8720 
Keep pid of salt CLI command from showing in status.pid output
 2013-12-05 04:32:09 -08:00
Joseph Hall
819a8918df Merge pull request #9044 from terminalmage/issue7952 
Fix py renderer example
 2013-12-05 04:16:45 -08:00
Erik Johnson
ac0e0cbbce Fix py renderer example 
The example had an incorrect data structure, this commit fixes that.
 2013-12-05 06:11:16 -06:00
Pedro Algarvio
a4ca5383ba Merge pull request #8995 from cvrebert/patch-1 
rm unused import from zcbuildout state
 2013-12-05 03:23:17 -08:00
Pedro Algarvio
6caa40bcbe Merge pull request #9039 from terminalmage/issue8585 
Fix argument parsing for arguments containing pound signs
 2013-12-05 03:21:18 -08:00
Pedro Algarvio
41798499d5 Merge pull request #9042 from mgwilliams/upstart 
upstart scripts: invoke via su so /etc/environment is read
 2013-12-05 03:20:24 -08:00
Gareth J. Greenaway
e30bd1673e Adding support to manage networks on Debian/Ubuntu systems. 2013-12-04 20:38:25 -08:00
Matthew Williams
f89a3a466c syndic upstart: invoke via su so /etc/environment is read 2013-12-04 19:17:01 -08:00
Matthew Williams
2f1d42638f upstart scripts: invoke via su so /etc/environment is read 2013-12-04 19:09:59 -08:00
Matt Hopkins
9718126a32 Support to appending node specific extra_install_flags to windows packages 2013-12-04 21:00:14 -05:00
Matt Hopkins
87788ebc1b Support to appending extra_install_flags to windows installer from the winrepo 2013-12-04 20:41:51 -05:00
Pedro Algarvio
c602339a1c Update the parser options with values from config file. Fixes #8447. 
The way the parser merges the CLI configuration with the file configuration is.

For each option:

  1. If a value was passed to the CLI, that value rules.
  2. If not value was passed to the CLI and no value is defined in the config file. The default, it any, is used.
  3. If a value is not passed to the CLI and the value is defined in the config file, the config file one will be used.

Some code was using the parser options for logic and values after the configuration loaded, but the parser options were never updated to the configuration files values.
So:

  4. Do what we said in the above 3, **and**, update the parser option to have that value.
 2013-12-04 23:45:28 +00:00
Erik Johnson
cadbcbd59d add test case for #8585 2013-12-04 17:29:48 -06:00
Erik Johnson
5ec7d9b113 Fix argument parsing for arguments containing pound signs 
Passing these through yaml.safe_load() will result in the pound sign and
everything after it being interpreted as a comment. This commit stops
the argument from being passed through yaml.safe_load if it is a string
and contains a pound sign.
 2013-12-04 17:18:46 -06:00
Pedro Algarvio
7442158364 Merge pull request #9027 from terminalmage/issue9002 
Pass through "env" in cmd.script
 2013-12-04 14:52:47 -08:00
Erik Johnson
acd3a8d8ee Pass through "env" in cmd.script 
Fixes #9002.
 2013-12-04 16:42:16 -06:00
C. R. Oldham
d6ea8a0c0d Merge pull request #9029 from erjohnso/develop 
Have to rely on source install of libcloud for now.
 2013-12-04 12:22:31 -08:00
C. R. Oldham
c14679ddae Merge pull request #9030 from cro/fix_8698 
Be more liberal about the format of the key we are looking for.
 2013-12-04 12:10:35 -08:00
C. R. Oldham
d188939b14 Be more liberal about the format of the key we are looking for. (e.g. accept 'ssh-rsa AAB3NzaC... comment' as well as just 'AAB3NzaC...') 2013-12-04 13:07:15 -07:00
Eric Johnson
9256e92e8e small issue in libcloud, need to install from source for now 2013-12-04 19:44:30 +00:00
Mike Place
398ebc1503 Don't run the #8976 tests on Windows. 2013-12-04 12:38:54 -07:00
Mike Place
8c31d96e17 Merge branch 'develop' into #8976 
* develop:
  Integration testing for #8976
 2013-12-04 12:34:47 -07:00
Mike Place
e6e0a7d919 Integration testing for #8976 2013-12-04 12:34:20 -07:00
C. R. Oldham
66d34c979c Merge pull request #9026 from cro/develop 
Return False if Postgres role create or role update fails.
 2013-12-04 11:18:46 -08:00
C. R. Oldham
ed5925c678 Return False if the role update fails (return value would be nonzero). 2013-12-04 12:16:22 -07:00
C. R. Oldham
5bf728343d Return False if the role creation fails (return value would be nonzero). Fixes #8778. 2013-12-04 12:13:36 -07:00
Erik Johnson
6a39fa4191 Keep pid of salt CLI command from showing in status.pid output 
When status.pid is executed by the salt-minion instance running on the
master, it also returns the pid of the salt CLI command, because the
search string matches. This commit adds another grep to the ps/grep/awk
one-liner, which filters out lines matching 'status.pid'.
 2013-12-04 12:39:59 -06:00
Mike Place
430df4c4e1 Grains detection for LXC and fix error in disk.usage under Docker 
I have modified the core grains detection routines where dragons often lay, so this should be reviewed carefully.

I have elected to set the LXC detection inside virtual_subtype for account for cases wherein a user might be running inside VirtualBox (as the tutorial for Docker leads one to do). Moreover, I also allow the virtualization detection to continue after LXC is detected, as I believe it may even be possibly for Xen and LXC to co-exist. (Though, let's be honest -- probably not recommended!)

Finally, disk.usage now correctly fails with a warning message and includes a work-around for gathering disk usage under Docker containers. This refs #8976.
 2013-12-04 11:18:15 -07:00
Samuel M Smith
cd1e587d65 Added debug 2013-12-04 10:42:44 -07:00
Samuel M Smith
e4693881ff Merge remote-tracking branch 'upstream/develop' into sam_20131202 2013-12-04 10:41:07 -07:00
Matt Hopkins
a817ca9aa3 switches paths to state files to use forwardslashes on masterless windows 2013-12-04 11:56:16 -05:00
ouiea
2ad4fd5107 Fixes issue #8951 - gem install fails when rvm is set up with another user 2013-12-04 12:11:08 -03:00
Frédéric Brin
b9ea313b91 Support Oracle Linux 5.x 
Oracle Linux 5, also known as Unbreakable Linux is currently
not supported by salt.

This one line fix solves this issue.

For reference, the os info extracted through platform.linux_distribution()
python call:
('Enterprise Linux Enterprise Linux Server', '5.1', 'Carthage')
 2013-12-04 15:50:49 +01:00
Pedro Algarvio
dc434ae1a5 Merge pull request #9017 from techhat/nodequery 
Allow single-provider node queries using -f
 2013-12-04 04:48:56 -08:00
Joseph Hall
f7785ad8f8 Remove code that was inadvertantly added too early 2013-12-04 05:46:49 -07:00
Joseph Hall
73ccda897e Disable pylint warnings about unused call variable 2013-12-04 05:44:50 -07:00
Joseph Hall
383a35d6a6 Allow single-provider node queries using -f 2013-12-04 05:09:20 -07:00
Pedro Algarvio
e39d5490b9 Merge pull request #9016 from techhat/typo 
Fix misleading message in disk monitoring state
 2013-12-04 03:53:29 -08:00
Joseph Hall
86ff76b39e Fix misleading message 2013-12-04 04:50:16 -07:00
Pedro Algarvio
b1e7888a84 Merge pull request #8999 from hulu/cp-env 
cp mod: honor `env` argument in list_master() & hash_file()
 2013-12-04 02:50:37 -08:00
Pedro Algarvio
2a2e3ad77b Merge pull request #9003 from cvrebert/patch-2 
make zcbuildout._Logger a new-style class
 2013-12-04 02:48:32 -08:00
Pedro Algarvio
4a5c10f296 Merge pull request #9007 from cachedout/postgres-unit-tests 
First-pass unit test coverage for the Postgres execution module.
 2013-12-04 02:47:41 -08:00
Pedro Algarvio
be6f93202d Merge pull request #9004 from makinacorpus/buildout-fixes 
buildout fixes from 996c7950cc
 2013-12-04 02:46:44 -08:00