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
59,441 Commits 24 Branches 182 Tags 341 MiB
f60f26da67
Commit Graph

59441 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Backlund
5367949e3b Expand documentation on VMware driver to explain more about creating a VM. Add power_on support when creating. 2015-09-23 17:21:29 -04:00
Colton Myers
c4965e14ea Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    salt/modules/yumpkg.py
 2015-09-23 14:36:09 -06:00
rhealitycheck
96004516b7 Update mongo_return.py 2015-09-23 15:11:55 -05:00
rhealitycheck
1787620b7d Update mongo_future_return.py 2015-09-23 15:11:21 -05:00
alex
f418fa7c0e Adds support for creating without cloning VMs. Makes it possible to manage standalone ESXi. 
Fixes saltstack/salt#26902
 2015-09-23 15:06:03 -04:00
rhealitycheck
973cbb42de Update mongo_return.py 
Fixing issues with serializing ObjectId in master.py -- apparently pymongo modifies the original load object to have the ObjectId generated by it. Will raise an issue with them because it shouldn't be modifying static data IMHO
 2015-09-23 13:37:07 -05:00
rhealitycheck
a899e384b6 Update mongo_future_return.py 
Fixing issues with serializing ObjectId in master.py -- apparently pymongo modifies the original load object to have the ObjectId generated by it. Will raise an issue with them because it shouldn't be modifying static data IMHO.
 2015-09-23 13:32:01 -05:00
Mike Place
6f3da863fc Merge pull request #27305 from cachedout/issue_27103 
Re-init logging system on Windows when using multiprocessing
 2015-09-23 09:32:32 -06:00
Mike Place
684e33aeb2 Merge pull request #27331 from terminalmage/dockerng-cmd 
dockerng: Allow both cmd and command to be used to specify command
 2015-09-23 09:27:43 -06:00
Mike Place
3e6b5cfc72 Merge pull request #27247 from rghe/zypper-no-gpg 
supports skip_verify option for zypper during package installation/update
 2015-09-23 08:50:55 -06:00
Mike Place
23fcc9e348 Merge pull request #27248 from tinyclues/better_cors_headers 
[Saltnado] - The CORS implementation was a bit naive about headers allowance.
 2015-09-23 08:50:06 -06:00
Mike Place
3933eed307 Merge pull request #27249 from tinyclues/login_support_more_content_type 
[Saltnado] - Add the support of login payload in JSON and YAML.
 2015-09-23 08:49:42 -06:00
Erik Johnson
a3f4fa1106 Merge pull request #27327 from isbm/isbm-pkg-info-typofix 
Fix a typo in the RPM output
 2015-09-23 09:27:42 -05:00
Erik Johnson
7d4eaac8ae dockerng: Allow both cmd and command to be used to specify command 2015-09-23 09:11:29 -05:00
Bo Maryniuk
7912f8c13b Fix typo 2015-09-23 13:24:03 +02:00
Alexander Backlund
9354b8a594 Merge branch 'vmware-standalone-esxi' of https://github.com/alxbse/salt into vmware-standalone-esxi 2015-09-23 07:07:30 -04:00
Alexander Backlund
be6921954e Adds support for creating VMs without cloning. Makes it possible to manage standalone ESXi. 
Fixes saltstack/salt#26902
 2015-09-23 07:06:25 -04:00
Alexander Backlund
73dd3d3908 Stupid forgot to set name and email 2015-09-23 06:51:40 -04:00
alex
b13310f091 Adds support for creating without cloning VMs. Makes it possible to manage standalone ESXi. 
Fixes saltstack/salt#26902
 2015-09-23 05:48:03 -04:00
Colton Myers
a789303d75 Merge pull request #27312 from basepi/merge-forward-2015.8 
[2015.8] Merge forward from 2015.5 to 2015.8
 2015-09-22 16:52:14 -06:00
Colton Myers
84eba18a93 Merge pull request #27313 from basepi/merge-forward-develop 
Merge forward from 2015.8 to develop
 2015-09-22 16:11:07 -06:00
Colton Myers
647080d064 Add missing import 2015-09-22 16:05:02 -06:00
Colton Myers
ec6cd80496 Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 
Conflicts:
    doc/man/salt.7
    doc/ref/auth/all/index.rst
    doc/ref/auth/all/salt.auth.rest.rst
    doc/ref/beacons/all/index.rst
    doc/ref/beacons/all/salt.beacons.ps.rst
    doc/ref/pillar/all/index.rst
    doc/ref/pillar/all/salt.pillar.consul_pillar.rst
    doc/ref/pillar/all/salt.pillar.neutron.rst
    doc/ref/pillar/all/salt.pillar.sql_base.rst
    doc/ref/pillar/all/salt.pillar.sqlite3.rst
    doc/ref/sdb/all/salt.sdb.rest.rst
    salt/modules/rh_ip.py
    salt/utils/http.py
 2015-09-22 15:31:46 -06:00
Colton Myers
95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8 
Conflicts:
    salt/config.py
    salt/minion.py
    salt/modules/yumpkg.py
    salt/runners/ssh.py
    salt/states/git.py
    salt/states/http.py
 2015-09-22 15:20:17 -06:00
Colton Myers
ca4597b93a Merge pull request #27310 from basepi/merge-forward-2015.5 
[2015.5] Merge forward from 2014.7 to 2015.5
 2015-09-22 15:08:41 -06:00
Colton Myers
7b75e4aed1 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.5 2015-09-22 15:07:45 -06:00
Colton Myers
982c21c79f Merge pull request #27308 from terminalmage/fix-refresh_db-regression 
Fix refresh_db regression in yumpkg.py
 2015-09-22 15:07:28 -06:00
Mike Place
7a7492d186 Fix typo 2015-09-22 14:51:14 -06:00
Joseph Hall
1eaa6dfa2d Merge pull request #27302 from rallytime/use_fqdn_softlayer 
Allow the use of FQDN in the SoftLayer Drivers by implementing use_fqdn flag
 2015-09-22 14:26:45 -06:00
Erik Johnson
77686fb7ce Fix refresh_db regression in yumpkg.py 
739b2ef introduced a regression by changing this function to passing a
list of arguments. The regression was also partly caused by requiring
the user to pass the yum CLI arguments for enabling and disabling repos
manually. So if someone passed multiple values for the repo argument
(e.g. repo='--disablerepo="*" --enablerepo=anotherrepo') then these
would both end up in the same list element, which would cause the yum
command to fail as they would be expected by yum to be a single argument
instead of separate arguments.

This commit reverts the changes from 739b2ef and also changes the
inconsistent behavior of requiring the repo options to be manually
submitted, making this function instead work like all the other
functions (install(), etc.) which interpret the Salt CLI kwargs to
figure out which repo options to use.

Fixes #27307.
 2015-09-22 15:11:33 -05:00
Nicole Thomas
9a8502cb9a Merge pull request #27273 from techhat/gcereq 
Add request_instance() to gce driver
 2015-09-22 13:48:46 -06:00
Justin Findlay
c3b690273b Merge pull request #27303 from jacobhammons/ref-updates 
Updated module doc index using https://github.com/saltstack/salt/pull…
 2015-09-22 13:29:04 -06:00
Mike Place
aaa2db9943 Merge pull request #27301 from twangboy/fix_27081 
Pass ca_bundle for windows (fixes SSL Error)
 2015-09-22 13:00:44 -06:00
Mike Place
22c653482c Re-init logging system on Windows when using multiprocessing 
Closes #27103
 2015-09-22 12:55:47 -06:00
Jacob Hammons
7ac98a03b6 Updated module doc index using https://github.com/saltstack/salt/pull/27203 2015-09-22 11:54:34 -06:00
rallytime
11a0a528a7 Make sure the VM can be deleted if it was created with use_fqdn 2015-09-22 11:45:27 -06:00
rallytime
ba7dbc6ab0 Make sure the minion id gets set, and change softlayer_hw to work, too. 2015-09-22 11:44:50 -06:00
rallytime
9dcd11c155 Created a 'use_fqdn' flag to allow softlayer minion to use an FQDN as their minion id 2015-09-22 11:44:39 -06:00
twangboy
5c4f5f8944 Changed windows gate to check for verify_ssl option 2015-09-22 11:35:19 -06:00
Joseph Hall
d29f5c6bd1 Linting 2015-09-22 11:15:33 -06:00
Mike Place
55f4050146 Merge pull request #27300 from rallytime/bp-27287 
Back-port #27287 to 2015.8
 2015-09-22 10:59:07 -06:00
Mike Place
775a4f9ad0 Merge pull request #27286 from terminalmage/return_retry_timer 
Add a configurable timer for minion return retries
 2015-09-22 10:35:07 -06:00
Mike Place
f63f4d8c43 Merge pull request #27289 from terminalmage/encrypted-cli-pillar 
Feature add: Encrypted CLI pillar data
 2015-09-22 10:34:13 -06:00
twangboy
e2fe5a60b5 Pass ca_bundle for windows (fixes SSL Error) 2015-09-22 10:33:28 -06:00
Mike Place
3e30daba25 Merge pull request #27298 from DSRCompany/feature/23157_module_executor 
Don't modify return results in splay.
 2015-09-22 10:27:53 -06:00
rhealitycheck
e49a6dc449 Update mongo_return.py 
same patch as for the future return. allows users to use older versions of pymongo if desired or the most recent ones.
 2015-09-22 09:35:07 -06:00
rhealitycheck
63153322b9 Update mongo_future_return.py 
Tracks the version so that it can compare pymongo versions and support older versions as well as the new versions that don't support "Connection"
 2015-09-22 09:35:07 -06:00
Dmitry Kuzmenko
d01bfed117 Don't modify return results in splay. 
Splay originally was converting return to dict and adding 'splay' key to
the return result. That breaks salt scripts.
 2015-09-22 18:02:44 +03:00
Erik Johnson
bacc76c355 Update mocked objects for state module tests 
Added the new pillar_enc value
 2015-09-22 08:25:51 -05:00
Justin Findlay
0dd68f73eb Merge pull request #27291 from khrisrichardson/remove-dup-cmd_ret 
Fixes https://github.com/saltstack/salt/pull/26355/files#r37261911
 2015-09-21 21:25:47 -06:00