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
87,107 Commits 24 Branches 182 Tags 341 MiB
68ed8c21b2
Commit Graph

87107 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Mike Place
68ed8c21b2 Merge branch 'develop' into jinja-test-imports 2017-10-19 15:42:20 -05:00
Mike Place
866a78a673 Merge pull request #44176 from vernondcole/simplify-saltify 
Simplify saltify cloud driver
 2017-10-19 14:37:17 -05:00
Vernon Cole
4c8cd9c507
lint and comment fixes 2017-10-19 10:16:28 -06:00
Nicole Thomas
b59cd3698e Merge pull request #44177 from senthilkumar-e/redis_doc_update 
Fixing default redis.host in documentation
 2017-10-19 09:38:30 -04:00
Nicole Thomas
e52aac2587 Merge pull request #43649 from twangboy/win_installer_multimaster 
Add support for multimaster setup
 2017-10-19 09:20:44 -04:00
Nicole Thomas
f77fa8ec26 Merge pull request #44159 from benediktwerner/fix-shadow-test 
Fix shadow module unit test if not root or the module is not present
 2017-10-19 09:14:08 -04:00
Senthilkumar Eswaran
44e37bf6e5 Fixing default redis.host in documentation 2017-10-18 22:08:26 -07:00
Vernon Cole
2b4f69e1f8
remove unused parameter 2017-10-18 20:20:36 -06:00
Vernon Cole
cce7bc9719
add more unit tests 2017-10-18 20:06:14 -06:00
Benedikt Werner
4bfeb7f1d1
Fixed missing import 2017-10-19 03:17:16 +02:00
Nicole Thomas
3d5e3e51e9 Merge pull request #43454 from kunal-bajpai/fix_returner_core 
Fix save_load which is never called for returner jobs
 2017-10-18 15:39:12 -04:00
rallytime
832aa3010c
Reorder and group imports in jina template unit tests 
The imports were scattered around quite a bit, which made it hard
to see where multiple uses of salt/utils/* imports were being pulled
in.

This PR just adjusts the ordering so it's easier to see what is included
already for the future. (This is particularly useful for catching misuses
of salt.utils.__init__.py functions.)
 2017-10-18 14:15:50 -04:00
Benedikt Werner
77b948b00a
Skip shadow module unit test if not root or no shadow 2017-10-18 19:10:55 +02:00
Mike Place
990a454f99 Merge pull request #44153 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-18 10:51:14 -06:00
Vernon Cole
805d5106ed
remove references to salt-api from docs 2017-10-18 10:50:47 -06:00
Vernon Cole
33fb7331a9
convert netapi calls to client calls 2017-10-18 10:47:09 -06:00
Nicole Thomas
2261f0b3c5 Merge pull request #44089 from cetanu/patch-1 
Catch on empty Virtualbox network addr #43427
 2017-10-18 12:15:10 -04:00
Nicole Thomas
8d6e4df752 Merge pull request #44102 from pratik705/add-auto_delete-option-while-attaching_disk 
add "auto_delete" option to "attach_disk" and "create_attach_volumes"
 2017-10-18 12:13:01 -04:00
Nicole Thomas
255a20f0e7 Merge pull request #44123 from terminalmage/gitfs-singleton 
Use one salt.utils.gitfs.GitFS instance per thread
 2017-10-18 12:12:25 -04:00
Nicole Thomas
8fdf0fa91f Merge pull request #44144 from b-harper/doc-venv_bin-state 
add documentation for venv_bin in virtualenv_mod state
 2017-10-18 12:10:18 -04:00
Nicole Thomas
c72deedc14 Merge pull request #44141 from wido/parted-units 
parted: Cast boundary to string when checking unit type
 2017-10-18 12:09:44 -04:00
garethgreenaway
ae5b58c64b Merge pull request #44146 from rallytime/groupadd-cleanup 
Replace salt utils import with correct salt.utils.files path
 2017-10-18 07:23:54 -07:00
rallytime
d712031a43
Update to_unicode util references to new stringutils path 2017-10-18 09:44:55 -04:00
rallytime
b8dc018178
Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/modules/opkg.py
  - salt/utils/templates.py
  - tests/unit/templates/test_jinja.py
 2017-10-18 09:37:47 -04:00
rallytime
0311c2a4de
Replace salt utils import with correct salt.utils.files path 
This fixes a couple of test failures in the develop branch and cleans up
a couple of formatting issues and import ordering.
 2017-10-17 17:55:18 -04:00
Mike Place
afcaa0c591 Merge pull request #43913 from twangboy/win_fix_test_jinja 
Fix `unit.templates.test_jinja` for Windows
 2017-10-17 15:09:04 -06:00
Mike Place
fc5754c6a1 Merge pull request #43917 from twangboy/win_unit_test_pillar 
Fix `unit.test_pillar` for Windows
 2017-10-17 15:06:45 -06:00
Mike Place
d15de697f8 Merge pull request #44058 from mkoderer/issues/44056 
Use correct mac prefix for kvm/qemu
 2017-10-17 14:45:56 -06:00
Mike Place
d8e909777d Merge pull request #44014 from garethgreenaway/43961_sls_id_pillar 
[develop] Additions to state.sls_id
 2017-10-17 14:43:40 -06:00
Mike Place
72e39caed7 Merge branch 'develop' into 43961_sls_id_pillar 2017-10-17 14:43:22 -06:00
Mike Place
73c3581864 Merge pull request #44037 from vernondcole/vagrant-cloud 
Vagrant cloud and state modules
 2017-10-17 14:36:38 -06:00
Mike Place
4809dd41c0 Merge branch 'develop' into gitfs-singleton 2017-10-17 14:16:28 -06:00
Ben Harper
6823cdcbfa
add documentation for venv_bin in virtualenv_mod state 2017-10-17 19:21:29 +00:00
Nicole Thomas
1701556faf Merge branch 'develop' into add-auto_delete-option-while-attaching_disk 2017-10-17 11:50:35 -04:00
Nicole Thomas
6252f82f58 Merge pull request #44133 from cachedout/fix_paralell_docs 
Fix typos in parallel states docs
 2017-10-17 11:24:18 -04:00
Wido den Hollander
4c02f6ccd8
parted: Cast boundary to string when checking unit type 
It could be that just a number (integer) is passed to as either
start or end to the module which is then already a int.

The endswith() method will then fail because that is a String function.

By casting it to a String while checking we make sure that the function
works.

Signed-off-by: Wido den Hollander <wido@widodh.nl>
 2017-10-17 17:03:47 +02:00
Mike Place
0d3f5db867 Merge pull request #44135 from timfreund/insert_missing_verb 
Insert missing verb in gitfs walkthrough
 2017-10-17 08:32:13 -06:00
Marc Koderer
c4d9684a90 Use correct mac prefix for kvm/qemu 
Using the private mac range for vms makes it impossible to
distinguish between hypervisors.

Issues #44056

Signed-off-by: Marc Koderer <marc.koderer@sap.com>
 2017-10-17 10:46:06 +02:00
Tim Freund
9557504b75
Insert missing verb in gitfs walkthrough 2017-10-16 20:27:56 -04:00
Mike Place
b651ff0534 Merge pull request #44129 from rallytime/merge-develop 
[develop] Merge forward from 2017.7 to develop
 2017-10-16 16:48:16 -06:00
Mike Place
8d1c1e21f0
Fix typos in paralell states docs 2017-10-16 16:43:10 -06:00
Nicole Thomas
9dacbf69b9 Merge pull request #44127 from terminalmage/salt.utils 
Add top-level docstrings to a bunch of salt.utils modules which are missing them
 2017-10-16 16:28:27 -04:00
Erik Johnson
3e96225210
Use one salt.utils.gitfs.GitFS instance per thread 
This reduces some of the overhead caused by many concurrent fileclient
requests from minions.

Additionally, initializing remotes has been folded into the GitBase
class' dunder init. Instantiating an instance and initializing its
remotes were initially split so that an object could simply be created
with the master opts so that the configuration was loaded and nothing
else, allowing for certain cases (like clearing the cache files) where
we didn't need to actually initialize the remotes. But this both A)
presents a problem when the instance being used is a singleton, as you
don't want to be re-initializing the remotes all the time, and B)
suppressing initialization can be (and is now being) done via a new
argument to the dunder init.
 2017-10-16 15:25:29 -05:00
Mike Place
a9700f6061 Merge pull request #44055 from eyj/jid_queue 
Activate jid_queue also for SingleMinions to workaround (Backport)
 2017-10-16 14:14:51 -06:00
Mike Place
6c3a500beb Merge pull request #44060 from The-Loeki/doc-roster 
doc fixes for salt-ssh roster(s) opts
 2017-10-16 14:12:40 -06:00
Nicole Thomas
2fba45cd3f Merge pull request #44125 from rallytime/merge-2017.7 
[2017.7] Merge forward from 2017.7.2 to 2017.7
 2017-10-16 16:02:24 -04:00
Nicole Thomas
68974aa74d Merge pull request #44029 from msummers42/2017.7 
addresses issue #43307, disk.format_ to disk.format
 2017-10-16 15:59:19 -04:00
Nicole Thomas
d0bbe65ffa Merge pull request #44079 from skizunov/develop2 
opkg: Fix usage with pkgrepo.managed
 2017-10-16 15:58:12 -04:00
rallytime
54c4be35ae
Update any moved utils references from the merge-forward 2017-10-16 15:47:32 -04:00
Pratik Bandarkar
a685f458ed add "auto_delete" option to "attach_disk" and "create_attach_volumes" 
for GCP.

fixes #44101

  - This fix will allow user to specify "auto_delete" option with
    attach_disk or "create_attach_volumes" function
 2017-10-16 19:33:48 +00:00