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
45,328 Commits 24 Branches 182 Tags 341 MiB
215a35c0ff
Commit Graph

45328 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joseph Hall
215a35c0ff Joyent now requires a keyname to be set 2015-02-19 14:52:08 -07:00
Joseph Hall
52de0f61f9 Linting 2015-02-19 14:22:52 -07:00
Joseph Hall
73194817ef Update Joyent to API version 7.2 2015-02-19 13:58:40 -07:00
Joseph Hall
337286b3b6 Switch Joyent to use salt.utils.cloud.bootstrap 2015-02-19 13:58:16 -07:00
Thomas S Hatch
2fee16b26f Merge pull request #20802 from jfindlay/2015.2 
Merge 2014.7 into 2015.2
 2015-02-18 14:01:30 -07:00
jfindlay
da186a0fac Merge pull request #20801 from rallytime/bp-20713 
Backport #20713 to 2015.2
 2015-02-18 12:21:59 -07:00
Justin Findlay
dae5e2ddc6 Merge remote-tracking branch 'salt/2014.7' into 2015.2 
Conflicts:
	doc/topics/reactor/index.rst
	salt/modules/publish.py
	salt/modules/systemd.py
	salt/payload.py
 2015-02-18 11:33:10 -07:00
Fred Reimer
db4fc06c43 fix pylint spacing, plus sig2 uses provider, not prov_dict 2015-02-18 11:22:08 -07:00
Fred Reimer
d2d642d4db global not needed in sig2 and sig4 2015-02-18 11:22:08 -07:00
Fred Reimer
5fdb7bfb8c Bad cut and paste, use providers instead of prov_dict 2015-02-18 11:22:08 -07:00
Fred Reimer
f49d7e1330 Added Fred Reimer to AUTHORS 2015-02-18 11:22:08 -07:00
Fred Reimer
3f9a8d397e Updated documentation for instance role credential use 2015-02-18 11:22:08 -07:00
Fred Reimer
99b98235d8 Added instance role credentials capability 2015-02-18 11:22:08 -07:00
Fred Reimer
a834fa58ed Fixed headers spelling 2015-02-18 11:22:08 -07:00
Fred Reimer
aedfbd7ab9 Declare globals 2015-02-18 11:22:08 -07:00
Fred Reimer
37f816f27b Fixed assignment statement 2015-02-18 11:22:08 -07:00
Fred Reimer
2181179f6c Added instance role credentials capability 2015-02-18 11:22:07 -07:00
Thomas S Hatch
2cf898e55f Merge pull request #20800 from rallytime/bp-20768 
Backport #20768 to 2014.7
 2015-02-18 10:59:31 -07:00
vladislav-jomedia
30616defe5 Update config.py 2015-02-18 09:56:25 -07:00
vladislav-jomedia
89fd8ee6fe "dictionary changed size during iteration" issue fixed in config.py for salt-cloud 
iterating over dict fixed "RuntimeError: dictionary changed size during iteration" issue
 2015-02-18 09:56:25 -07:00
Thomas S Hatch
4007527072 Merge pull request #20781 from cachedout/mine_check 
Don't float exceptions on auth errors in mine
 2015-02-18 09:52:37 -07:00
jfindlay
09e3516511 Merge pull request #20783 from glomium/systemd_upstart 
ubuntu is switching from upstart to systemd
 2015-02-17 19:31:38 -07:00
Sebastian Braun
bfcab32885 ubuntu is switching from upstart to systemd 2015-02-18 02:48:59 +01:00
Mike Place
0c46b0874a Don't float exceptions on auth errors in mine 2015-02-17 18:00:41 -07:00
Thomas S Hatch
90ef4d7b0f Merge pull request #20778 from terminalmage/issue18943 
Add Synology OS detection
 2015-02-17 17:38:32 -07:00
Erik Johnson
bd65632096 Add Synology OS detection 2015-02-17 17:27:59 -06:00
Thomas S Hatch
7dbfaffe3e Merge pull request #20773 from jfindlay/state_run_test 
test state run requests
 2015-02-17 16:02:52 -07:00
Justin Findlay
b39f962369 add state module requested state run tests 
closes #16901
 2015-02-17 14:23:14 -07:00
Justin Findlay
1e36cbb5c4 fix issues with state module requested state runs 2015-02-17 14:23:14 -07:00
Thomas S Hatch
5ad79aec76 Merge pull request #20762 from jfindlay/fix_nftables 
fix nftables.get_rule_handle return error
 2015-02-17 13:01:39 -07:00
jfindlay
8fda896623 Merge pull request #20765 from rallytime/bp-20706 
Backport #20706 to 2014.7
 2015-02-17 12:36:10 -07:00
Thomas S Hatch
237f80497f Merge pull request #20739 from mikn/publish_return_fixes 
Giving publish.publish more robust return handling
 2015-02-17 12:31:17 -07:00
Thomas S Hatch
77543aebe2 Merge pull request #20764 from rallytime/bp-20715 
Backport #20715 to 2015.2
 2015-02-17 11:57:28 -07:00
Thomas S Hatch
8cb08364cb Merge pull request #20766 from rallytime/bp-20179 
Backport #20179 to 2015.2
 2015-02-17 11:41:22 -07:00
Thomas S Hatch
3ecbc72757 Merge pull request #20763 from mgwilliams/salt_client 
import salt.minion in client
 2015-02-17 11:41:14 -07:00
Thomas S Hatch
fbb42e7659 Merge pull request #20761 from rallytime/bp-19168 
Backport #19168 to 2015.2
 2015-02-17 11:41:08 -07:00
Thomas S Hatch
96d50ab34e Merge pull request #20759 from Unity-Technologies/cygwin-windows 
Fixed up the use of mirrors with cygwin
 2015-02-17 10:48:59 -07:00
rallytime
72b984dc8c Fix versionadded change and add the correct versionadded tags 2015-02-17 10:39:54 -07:00
Russell Ballestrini
db1fa966a1 modified: salt/modules/hg.py 2015-02-17 10:31:38 -07:00
Cimarron Mittelsteadt
819ece0a99 BUG: Removed extra quotes in hg.clone (not needed as cmd is already split as list) which was causing hg to abort on non-local repos like "ssh://...." 2015-02-17 10:31:38 -07:00
Russell Ballestrini
c63546fe33 Added hg identity argument to state and module 
We now support supplying a private SSH key path for authentication.

      modified:   salt/modules/hg.py
      modified:   salt/states/hg.py
 2015-02-17 10:31:38 -07:00
Achim Herwig
5d9ecaa434 Fix pep8 issues. 2015-02-17 10:23:33 -07:00
Achim Herwig
40d69636e2 Make systemd implementation of service.running aware of legacy service units. 2015-02-17 10:23:33 -07:00
Robin Wittler
efe044392e fix pylint issues 2015-02-17 10:13:57 -07:00
Robin Wittler
08f74bb4c3 fix file permission errors 
* add salt.utils.(get_uid/get_gid) functions
  * extend salt.utils.fopen to make use of
    uid, gid and mode keyword arguments.
  * extend SAuth.verify_signing_master method so it
    uses now salt.utils.get_uid and calls
    salt.utils.fopen with the uid keyword

  extend minion.get_proc_dir:
    * add kwargs to function signature
    * extend doc string
    * handle mode in os.makedirs
    * check if mode of existing dir needs to be changed
    * check if uid/gid needs to be changed (only if os.chmod is
    * available)

  * extend minion.Minion.__init__ to call minion.get_proc_dir with kwargs
  * extend minion.Proxyminion.__init__ to call minion.get_proc_dir with kwargs
 2015-02-17 10:13:57 -07:00
Matthew Williams
23450f90ae import salt.minion in client 2015-02-17 17:00:45 +00:00
Justin Findlay
6708cf197c fix nftables.get_rule_handle return error 
fixes #20747
 2015-02-17 09:56:25 -07:00
Arnold Bechtoldt
4df6f5017f fixing lint error PEP8 E712 2015-02-17 09:53:51 -07:00
Arnold Bechtoldt
58fbb2a263 Enhance ssh.user_keys to skip private key file exports 2015-02-17 09:53:51 -07:00
Daniel Hobley
efe48b2a27 Fixes for pylint 2015-02-17 17:42:27 +01:00