valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-09 01:36:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
26,927 Commits 24 Branches 182 Tags 341 MiB
2c45e0c477
Commit Graph

26927 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Samuel Smith
ab38561209 Merge pull request #10751 from SmithSamuelM/sam_raet_12 
Sam raet 12
 2014-02-25 15:39:54 -07:00
Samuel M Smith
ac6d5cf013 Merge remote-tracking branch 'upstream/develop' into sam_raet_12 2014-02-25 15:39:28 -07:00
Samuel M Smith
ce121c2806 Added way to get master host address from opts 2014-02-25 15:38:45 -07:00
Thomas S Hatch
1855180141 init the master raet port 2014-02-25 15:34:57 -07:00
Thomas S Hatch
9d44556057 change default raet port to 4506 
this makes it so that we don't need to change the master_port on the
minion config
 2014-02-25 15:29:55 -07:00
Thomas S Hatch
e85f41be74 Append a tuple, not 3 values 2014-02-25 15:20:36 -07:00
Thomas S Hatch
053333cc27 Init the opts as exploded into the etst store 2014-02-25 15:17:51 -07:00
Thomas S Hatch
45a5007284 Add populate opts behavior 2014-02-25 15:17:51 -07:00
David Boucha
97b26dfffa Merge pull request #10750 from UtahDave/develop 
Add links to 2014.1.0 installers
 2014-02-25 15:02:39 -07:00
David Boucha
b6a80197d2 Add links to 2014.1.0 installers 2014-02-25 15:00:47 -07:00
Mike Place
0c5e074a04 Merge pull request #10745 from rallytime/mac_group_test 
Started writing unit tests for mac_group
 2014-02-25 14:44:45 -07:00
Thomas S Hatch
41bd46fbb9 Tune_in, not start 2014-02-25 14:42:28 -07:00
Thomas S Hatch
d492697761 fix flodir path 2014-02-25 14:38:42 -07:00
Samuel Smith
5269b15ad1 Merge pull request #10749 from SmithSamuelM/sam_raet_12 
Sam raet 12 Fixed conflict with Tom
 2014-02-25 14:38:21 -07:00
Samuel M Smith
f4ae0e2b99 fixed conflict 2014-02-25 14:37:13 -07:00
Chris Rebert
e27edc37b0 avoid shadowing module-level log in dockerio 2014-02-25 13:35:44 -08:00
Thomas S Hatch
b15387920d Add the floscripts to the setup.py 2014-02-25 14:35:34 -07:00
Samuel M Smith
da493e9e28 Merge remote-tracking branch 'upstream/develop' into sam_raet_12 2014-02-25 14:33:28 -07:00
Samuel M Smith
6bd967d9bb fixed typo 2014-02-25 14:32:48 -07:00
Thomas S Hatch
73ec91338a Call the corect ioflo gateway class 2014-02-25 14:32:45 -07:00
Thomas S Hatch
73dfc0849a fix moved ioflo gateway classes 2014-02-25 14:30:41 -07:00
Samuel M Smith
a3cdb28161 Starting adding reliability to Joiner transaction 2014-02-25 14:14:20 -07:00
Thomas S Hatch
487126f826 Merge pull request #10736 from nshalman/smartos-smf 
SMF Fixes (SmartOS / Solaris)
 2014-02-25 14:14:11 -07:00
rallytime
bced074647 Started writing unit tests for mac_group 2014-02-25 14:02:54 -07:00
Samuel Smith
0478bbb95f Merge pull request #10744 from SmithSamuelM/sam_raet_11 
Sam raet 11  salt.daemons.IofloMaster and IofloMinion now work basically
 2014-02-25 13:55:56 -07:00
Daniel Bradshaw
ba444828d0 This should really be an else 2014-02-25 20:55:17 +00:00
Samuel M Smith
e6c889d5d4 Merge remote-tracking branch 'upstream/develop' into sam_raet_11 2014-02-25 13:54:37 -07:00
Samuel M Smith
248ef7c96c Merge remote-tracking branch 'upstream/develop' into sam_raet_11 
Conflicts:
	salt/daemons/__init__.py
 2014-02-25 13:54:11 -07:00
Joseph Hall
0c90d61747 Merge pull request #10743 from hulu/docker-info-shadowing 
avoid shadowing of info() in dockerio module
 2014-02-25 13:37:45 -07:00
Chris Rebert
ff78a2009d avoid shadowing of info() in dockerio module 2014-02-25 12:35:46 -08:00
Thomas S Hatch
dd00e7592a Merge pull request #10735 from danielfrg/patch-1 
Not verbose by default
 2014-02-25 13:31:51 -07:00
Thomas S Hatch
1a91817221 Merge pull request #10734 from rallytime/mac_user_test 
More mac_user tests
 2014-02-25 13:31:31 -07:00
Thomas S Hatch
d74e34c9e1 Merge pull request #10731 from terminalmage/tests 
Add comment about importance of empty line
 2014-02-25 13:30:57 -07:00
Thomas S Hatch
de68d1761f Merge pull request #10715 from edlane/develop 
rename map.py to diff.py, sort minions within a pool, ...
 2014-02-25 13:30:03 -07:00
Thomas S Hatch
7a8b74f16d Merge pull request #10712 from gtmanfred/uptodate 
Uptodate
 2014-02-25 13:28:50 -07:00
Thomas S Hatch
eb4520096b Merge pull request #10709 from mgwilliams/postgres 
postgres_users: report changes when user is created
 2014-02-25 13:26:59 -07:00
Thomas S Hatch
120bfd98f7 Merge pull request #10708 from otrempe/develop 
Add option in reg state and module to disable reflection on Windows 64-b...
 2014-02-25 13:26:05 -07:00
Samuel M Smith
dbb2803b7d integration stuff 2014-02-25 13:20:49 -07:00
Mathieu Le Marec - Pasquet
f9a116ee9c Support multiline cron comments 
This fixes #10721.
 2014-02-25 19:52:47 +00:00
Daniel Rodriguez
b0197c9d12 Not verbose by default 
Removing the tar verbose (`-v`) by default, still could be used if wanted on `tar_options`.
 2014-02-25 13:32:24 -06:00
Nahum Shalman
e2907850b5 SmartOS/Solaris: fix SMF service management 
fixes saltstack/salt#10702

The functions previously named get_enabled and get_disabled
actually only queried what services were running or not

This caused breakages where a state that both requested
"enabled" and "running" could cause salt to start the
service which would make it appear in the list of
enabled services, but not actually get enabled
and thus not actually come back up on reboot

Those functions have been renamed to get_running
and get_stopped

An accurate enabled function has been written
which queries the true property that determines
if a service will come up at boot
and disabled returns its negation.

New get_enabled and get_disabled functions have
also been written which accurately return the
list of enabled or disabled services
Those functions return full FMRIs (rather than the
much shorter 'SVC' column) because that's how
SMF actually works internally.
 2014-02-25 14:32:20 -05:00
Nahum Shalman
125afd748a modules/smf.py: pylint fixes / cleanup 2014-02-25 14:21:29 -05:00
Nahum Shalman
9a99458672 Solaris/SmartOS: Handle services in maintenance 
SMF has a concept of the maintenance state where the
system knows the service is broken which requires an
explicit "svcadm clear <service>"

"svcadm enable -s <service>" returns code 3 when the service
is in maintenance (-s means wait to see how enabling went)

Salt should notice a return code of 3, attempt to clear
the service and try to enable one more time.

Common use case is a broken configuration file.
The user pushes a fix to the config file with salt which should
clear the maintenance state and attempt to enable the service
again.
 2014-02-25 14:21:29 -05:00
ed lane
433c130986 Update diff.py 2014-02-25 12:12:33 -07:00
rallytime
c58a6a53a3 More mac_user tests 2014-02-25 11:59:34 -07:00
Erik Johnson
499f828440 Minor tweaks to new pkg.uptodate state 
2 minor changes:

1. Moved state function up above mod_init(). This is just for
   consistency across the codebase, mod_init() typically just appears at
   the bottom of the .py file (and if it's not there it probably should
   be).

2. Used a versionadded RST directive to note that this state is not yet
   available, as our automated docs builds will otherwise make it seem
   like this state is available for immediate use once your pull request
   is merged upstream.
 2014-02-25 12:37:34 -06:00
Daniel Wallace
ebd429f528 Be more explicit in the pacman module 
If we are going to be more explicit, we should be more explicit
throughout the entire thing.  From issue 10519.
 2014-02-25 12:37:34 -06:00
Daniel Wallace
bf5a28d5d6 [salt] clean up and document 
clean up for pep8 and document uptodate
 2014-02-25 12:37:34 -06:00
Daniel Wallace
e9f04f095f [salt] add a state to make sure the system is uptodate 2014-02-25 12:37:34 -06:00
Thomas S Hatch
5cdf4ff37b whitespace 2014-02-25 11:21:21 -07:00