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

7232 Commits

Author SHA1 Message Date
Nicole Thomas
c13f0dc2a8 Revert "Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings" 2017-05-03 16:49:39 -06:00
Mike Place
a1f83ebb1e Merge pull request #41033 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-05-03 11:13:42 -06:00
Mike Place
3626258f50 Merge pull request #40899 from rallytime/remove-md5-warning 
Updated ssh fingerprint hash-type default to sah256 for Nitrogen and remove md5 warnings
 2017-05-03 10:55:26 -06:00
rallytime
19a3ecd5b8 Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-05-03 09:59:09 -06:00
rallytime
fc756c595c Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/ref/configuration/master.rst
  - salt/config/__init__.py
 2017-05-02 12:52:59 -06:00
Mike Place
19894f68ca Merge pull request #40724 from cro/minion_key_revoke_cfg 
Minion key revoke cfg
 2017-05-02 11:18:05 -06:00
rallytime
8e4b679d5c Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/pip.py
 2017-05-01 10:45:19 -06:00
rallytime
a69cd74f75 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/nova.py
  - salt/spm/__init__.py
 2017-04-28 09:23:42 -06:00
rallytime
7f31e41aa6 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/modules/pip.py
 2017-04-28 09:20:59 -06:00
Mike Place
909d519ddb Merge pull request #40751 from rallytime/fix-39531 
Use Salt's SaltYamlSafeLoader and SafeOrderedDumper classes for yaml.load/dump
 2017-04-28 06:56:05 -06:00
Mike Place
8fdfe4ece6 Merge pull request #40935 from gtmanfred/softlayer 
Attempt to connect to public ip address in softlayer
 2017-04-28 05:43:57 -06:00
Erik Johnson
e494ae43e5 Add dockerng fixes to 2016.11.4 release notes 2017-04-27 14:07:29 -05:00
Daniel Wallace
d6eb11410f Attempt to connect to public ip address in softlayer 
Unless private_ssh or private_wds is set.

Softlayer does not require that a public_vlan be set in order to build a server
with a public ip address.  It can also be cumbersome to keep track of multiple
public_vlans which can be configured at the account level if you have multiple
accounts.

Like other cloud providers softlayer should default to connecting to the
public_vlan unless private_ssh is set to True.
 2017-04-27 12:22:13 -06:00
Erik Johnson
8c078f144c Add additional note about quoting within load_yaml 2017-04-27 11:13:01 -05:00
Erik Johnson
123b5cdc11 Add documentation for PyYAML's loading of time expressions 
Also remove the notice about the handling of integer scalars starting
with zeroes, as this was fixed in 0.10.0 which is roughly 5 years old
now.
 2017-04-27 10:59:49 -05:00
Cory Wright
2995a05c2b Make salt.auth.rest heading consistent with all other salt.auth documentation 2017-04-27 09:32:53 -04:00
rallytime
e2aa5e2f21 Add fingerprint_hash_type default value change to release notes 2017-04-26 10:47:28 -06:00
Nicole Thomas
7c10a419a1 Merge pull request #40866 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-25 16:42:11 -06:00
Mike Place
5d9dd3ad56 Merge pull request #40805 from terminalmage/moby 
Alias moby to docker in Nitrogen (and later)
 2017-04-24 22:37:53 -06:00
rallytime
5372f25fde Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/cloud/clouds/rackspace.py
  - tests/unit/cloud/clouds/test_dimensiondata.py
 2017-04-24 15:35:28 -06:00
Ch3LL
e7b604339d
[2016.11] Bump latest release version to 2016.11.4 2017-04-24 13:29:28 -04:00
Ch3LL
889540a313
[2016.3] Bump latest release version to 2016.11.4 2017-04-24 13:27:15 -04:00
Erik Johnson
0e229a1910 Add note about moby naming to Nitrogen release notes 2017-04-23 23:34:58 -05:00
Daniel Wallace
b60a8d013a remove rackspace from index 2017-04-21 09:23:05 -06:00
Daniel Wallace
559aa1d8b6 remove deprecated firstgen rackspace cloud driver 2017-04-21 08:59:56 -06:00
rallytime
0b96d52f71 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/win_pkg.py
 2017-04-20 11:21:10 -06:00
Mike Place
5388ffa7a2 Merge pull request #40785 from alexproca/backport-winexec-selection 
win_pkg: backport 2016.11 add msiexec override to enable selection of 32 or 64 msiexec.exe
 2017-04-20 10:45:13 -06:00
Erik Johnson
f99259a6eb Fix inaccurate nodegroup docs 
We should probably support defining nodegroups as a "dictlist" in the
future, but we don't right now, so the docs are currently inaccurate.
 2017-04-20 10:07:19 -05:00
Alex Proca
91cafd5094 Add option to select 32 or 64 version of msiexec 
Pass path to msiexec overloading msiexec parameter
 2017-04-20 12:25:52 +03:00
rallytime
6493880bde Merge branch '2016.11' into 'nitrogen' 
No conflicts.
 2017-04-18 16:42:30 -06:00
Mike Place
e700d8183b Merge pull request #40745 from cro/vmware_disk_datastore_bp 
Backport `Add support for specifying a datastore for new disks.` PR #36457
 2017-04-18 14:00:50 -06:00
rallytime
62c4d37c2f Use salt.utils.yamlloader with SaltYamlSafeLoader as the Loader with yaml.load 2017-04-18 13:41:07 -06:00
C. R. Oldham
d24078d1a0 Add docs for "datastore" param for disks 2017-04-18 09:33:46 -06:00
C. R. Oldham
500d6b281d Document validity of a datastore key inside a disk definition. 2017-04-18 09:33:46 -06:00
Mike Place
785e6060a9 Add requested docs 2017-04-18 08:34:56 -06:00
rallytime
292f55600b Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/fileserver/s3fs.py
  - tests/unit/test_fileclient.py
 2017-04-17 13:32:56 -06:00
C. R. Oldham
65ea8997b7 Add allow_minion_key_revoke config option 2017-04-17 13:20:45 -06:00
Ch3LL
d228fb6e02
Add 2016.11.4 Release Note ChangeLog 2017-04-14 17:17:03 -04:00
Nicole Thomas
ceedbf1a63 Merge pull request #40649 from rallytime/merge-nitrogen 
[nitrogen] Merge forward from 2016.11 to nitrogen
 2017-04-12 11:18:32 -06:00
Mike Place
4af8d08e43 Merge pull request #40581 from terminalmage/release_notes 
Make scheduled change to osmajorrrelease grain, clean up Nitrogen release notes
 2017-04-11 16:49:15 -06:00
rallytime
e90622bc22 Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - salt/modules/dockermod.py
  - salt/modules/file.py
 2017-04-11 15:03:34 -06:00
Nicole Thomas
4beb7b4e77 Merge pull request #40644 from rallytime/nitrogen-doc-update 
Add autodoc modules for new files in nitrogen
 2017-04-11 14:59:26 -06:00
rallytime
3a232ffe8b Add autodoc modules for new files in nitrogen 2017-04-11 19:31:33 +00:00
Erik Johnson
6cf9202bc8 Fix more formatting issues in nitrogen release notes 
The wildcard versions docs should be grouped under the same top-level
bullet. Also, there was a stray execution module change that seems to
have tried to flee south. I have returned it to it's natural habitat.
 2017-04-11 11:02:58 -05:00
Erik Johnson
c36c9465e6 Formatting fixes for the module.run changes 
This fixes the RST formatting so that it renders properly in the
bulleted list format. It also makes some changes to the wording for
clarification purposes.
 2017-04-11 11:02:58 -05:00
Erik Johnson
3bbebd7d82 os_release -> osmajorrelease 
This is a typo fix
 2017-04-11 11:02:58 -05:00
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -06:00
rallytime
2cd0c5e4ec Merge branch '2016.11' into 'nitrogen' 
Conflicts:
  - doc/topics/cloud/azurearm.rst
  - salt/cloud/clouds/vultrpy.py
  - salt/modules/aptpkg.py
  - salt/modules/dockermod.py
  - tests/unit/modules/dockerng_test.py
  - tests/unit/modules/test_pillar.py
 2017-04-10 14:09:25 -06:00
Erik Johnson
f8bc423ef9 Merge pull request #40563 from terminalmage/merge-2016.3-2016.11 
Merge-forward 2016.3 -> 2016.11
 2017-04-07 10:08:19 -05:00
Joseph Hall
08d071bc68 Update Azure ARM docs 2017-04-06 09:43:19 -06:00