valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 01:18:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,831 Commits 24 Branches 182 Tags 341 MiB
1b98f7af38
Commit Graph

59831 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Wallace
1b98f7af38 fix bug where nova driver exits with no adminPass 2015-12-31 02:58:53 -06:00
Mike Place
3652dbae76 Merge pull request #30090 from techhat/seeddirs 
Add argument to isdir()
 2015-12-30 15:41:01 -07:00
Mike Place
a12bda4b30 Merge pull request #30094 from rallytime/module_state_doc_fix 
Fix doc formatting for cloud.create example in module.py state
 2015-12-30 15:40:24 -07:00
Joseph Hall
d7f46b5438 Merge pull request #30095 from rallytime/select_query_linode 
Add the list_nodes_select function to linode driver
 2015-12-30 14:06:57 -07:00
rallytime
4731d9442e Add the list_nodes_select function to linode driver 2015-12-30 13:40:52 -07:00
Joseph Hall
f7c7d9c7c2 Add lstrip 2015-12-30 13:28:39 -07:00
rallytime
8fbee322b9 Fix doc formatting for cloud.create example in module.py state 2015-12-30 13:16:53 -07:00
Joseph Hall
c70257163b Add argument to isdir() 2015-12-30 12:33:23 -07:00
Mike Place
dce64c0868 Merge pull request #30082 from abednarik/fix_grain_saltversion_index 
Fixed saltversioninfo grain return
 2015-12-30 11:23:17 -07:00
Mike Place
5602b8833e Merge pull request #30084 from rallytime/bp-29987 
Back-port #29987 to 2015.8
 2015-12-30 11:19:09 -07:00
Aditya Kulkarni
16e1df90e9 Make sure output file works for salt cloud 2015-12-30 09:55:13 -07:00
abednarik
882e9ac9ed Fixed saltversioninfo grain return. 
Looks like saltversioninfo is ruturning a string so there is no way to get values
by index. Updated return value to list.

Fixes #28763.
 2015-12-30 12:14:00 -03:00
Nicole Thomas
654cab0314 Merge pull request #30071 from rallytime/merge-forward-2015.8 
Merge branch '2015.5' into '2015.8'
 2015-12-29 16:17:59 -07:00
Nicole Thomas
1bf9853808 Merge pull request #30067 from lyft/boto-elb-stable-fix 
Pass in kwargs to boto_secgroup.convert_to_group_ids explicitly
 2015-12-29 16:04:33 -07:00
Nicole Thomas
0a37c4de1a Merge pull request #30069 from techhat/seeddirs 
Ensure that pki_dir exists
 2015-12-29 16:03:23 -07:00
rallytime
394d7548c5 Additional spelling fixes for boto_vpc module 2015-12-29 15:28:05 -07:00
rallytime
f7e58a241c Merge branch '2015.5' into '2015.8' 
Conflicts:
- salt/modules/boto_vpc.py
- tests/unit/modules/boto_vpc_test.py
 2015-12-29 15:27:03 -07:00
Joseph Hall
0f05d49bde Ensure that pki_dir exists 2015-12-29 15:07:26 -07:00
Ryan Lane
ae22edb1b4 Pass in kwargs to boto_secgroup.convert_to_group_ids explicitly 2015-12-29 14:04:55 -08:00
Mike Place
896655602e Merge pull request #30064 from rallytime/fix-30045 
Add Syndic documentation to miscellaneous Salt Cloud config options
 2015-12-29 13:15:45 -07:00
rallytime
6176f383e5 Spelling fixes 2015-12-29 11:57:18 -07:00
rallytime
83c05729d6 Add Syndic documentation to miscellaneous Salt Cloud config options 
Fixes #30045
 2015-12-29 11:53:49 -07:00
Mike Place
bad6daca93 Merge pull request #30049 from rallytime/esxi-unit-tests 
Add some more unit tests for the vsphere execution module
 2015-12-29 10:07:41 -07:00
Mike Place
cedee772d7 Merge pull request #30060 from rallytime/bp-27104 
Back-port #27104 to 2015.8
 2015-12-29 10:06:58 -07:00
William Huba
f0566c4b8f Remove only the file extension on cached node files instead of replacing every '.p' substring. 2015-12-29 09:21:12 -07:00
Mike Place
84db12212d Merge pull request #30059 from mpreziuso/patch-1 
Fixes wrong function scope
 2015-12-29 09:12:06 -07:00
Michele Preziuso
1cb1c2da07 Fixes wrong function scope 
`sdecode` is not in `salt.utils` but rather in `salt.utils.locales`.
This causes Python to throw an exception when executing `win_update.list_updates verbose`:

```
                The minion function caused an exception: Traceback (most recent call last):
                  File "c:\salt\bin\lib\site-packages\salt\minion.py", line 1036, in _thread_return
                    return_data = func(*args, **kwargs)
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 512, in list_updates
                    return str(quidditch.GetSearchResultsPretty())
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 310, in GetSearchResultsPretty
                    updates = self.GetSearchResults()
                  File "c:\salt\bin\lib\site-packages\salt\modules\win_update.py", line 305, in GetSearchResults
                    updates.append(salt.utils.sdecode(update))
                AttributeError: 'module' object has no attribute 'sdecode'
```
 2015-12-29 13:20:51 +00:00
Mike Place
87667e2de6 Merge pull request #30048 from jacobhammons/28540 
Remove internal APIs from rest_cherrypy docs.
 2015-12-28 16:24:13 -07:00
rallytime
1a83147986 Remove unnecessary import block 2015-12-28 16:14:13 -07:00
rallytime
695107ae6e Add some more unit tests for the vsphere execution module 
And fix a coupl of small bugs found in the module through testing
 2015-12-28 16:11:33 -07:00
Jacob Hammons
a04cebd48c Remove internal APIs from rest_cherrypy docs. 
Refs #28540
 2015-12-28 15:26:16 -07:00
Mike Place
3c63527313 Merge pull request #30043 from rallytime/fix-29960 
Be explicit about importing from salt.utils.jinja to avoid circular imports
 2015-12-28 14:35:18 -07:00
Mike Place
6cdca314c7 Merge pull request #30038 from rallytime/bp-30017 
Back-port #30017 to 2015.8
 2015-12-28 13:41:45 -07:00
Mike Place
c846e7bc86 Merge pull request #30036 from rallytime/bp-29995 
Back-port #29995 to 2015.8
 2015-12-28 13:41:04 -07:00
Mike Place
27b0bd2c34 Merge pull request #30035 from rallytime/bp-29895 
Back-port #29895 to 2015.8
 2015-12-28 13:20:58 -07:00
Mike Place
9e385369b7 Merge pull request #30034 from rallytime/bp-29893 
Back-port #29893 to 2015.8
 2015-12-28 13:20:51 -07:00
Mike Place
4d4dfd692a Merge pull request #30033 from rallytime/bp-29876 
Back-port #29876 to 2015.8
 2015-12-28 13:20:42 -07:00
rallytime
a157c78bc8 Be explicit about importing from salt.utils.jinja to avoid circular imports 
Fixes #29960
 2015-12-28 13:02:20 -07:00
Mike Place
a5f7d9c2fc Merge pull request #30029 from terminalmage/git.latest-nonexistant-branch 
git.latest: Fix handling of nonexistant branches
 2015-12-28 12:39:29 -07:00
rallytime
aab35b883e Add versionadded directive for new check_exists function. 2015-12-28 12:32:42 -07:00
Andreas Lutro
ca290ec3e1 change how alternatives states check for installed 2015-12-28 12:31:19 -07:00
Ruxandra Burtica
129a6d7b9f Added vm_ to the get_location query. 2015-12-28 12:30:28 -07:00
Ruxandra Burtica
af8d01a367 Updated ec2 file to correctly propagate location. 2015-12-28 12:30:28 -07:00
Aditya Kulkarni
09f208fe63 Do not SSH to the instance if deploy is False 2015-12-28 12:29:32 -07:00
Aditya Kulkarni
2fcf1590b8 Add info about VolumeType 2015-12-28 12:27:45 -07:00
rallytime
a257249789 Add versionadded to SSH Port docs 2015-12-28 12:24:04 -07:00
abednarik
0bb83e51aa Updated Cloud msic section. 
Added ssh_port section.
 2015-12-28 12:11:16 -07:00
Erik Johnson
0b95894c9f git.latest: Fix handling of nonexistant branches 
This commit fixes a traceback when a branch does not exist in the remote
repository.
 2015-12-28 11:16:43 -06:00
Mike Place
e7fe24dc64 Merge pull request #30016 from alprs/fix-gen_locale_normalize 
Properly normalize locales in locale.gen_locale
 2015-12-28 08:33:48 -07:00
Mike Place
90611e95f4 Merge pull request #30015 from alprs/fix-gen_locale_escaped_newline 
locale module: don't escape the slash in \n
 2015-12-28 08:31:20 -07:00