valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 17:09:03 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
76,958 Commits 24 Branches 182 Tags 341 MiB
fc756c595c
Commit Graph

6724 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Daniel Wallace
a86b101ae6 add retries on authentications of the salt minion reconnecting 2017-04-10 14:53:26 -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
Erik Johnson
a6d68f50fe Merge remote-tracking branch 'upstream/2016.3' into merge-2016.3-2016.11 2017-04-06 10:15:47 -05:00
Mike Place
28fc048030 Merge pull request #40464 from terminalmage/userdata-renderer 
salt-cloud: Do not pass userdata_file through yaml renderer
 2017-04-05 11:32:06 -06:00
Nicole Thomas
990bde4c07 Merge pull request #40530 from dmurphy18/aix_docupd 
Update release information for 2016.11.4 for additional AIX support
 2017-04-05 10:20:22 -06:00
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile 
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
 2017-04-04 15:41:43 -05:00
Erik Johnson
b440d0c679 Update 2016.11.4 release notes for userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
a6064fb2e4 Rename userdata_renderer -> userdata_template in master config docs 2017-04-04 15:41:43 -05:00
Erik Johnson
eddbd41265 Openstack did not have templating support for userdata_file before 2016.11.4 2017-04-04 15:41:43 -05:00
Erik Johnson
a85a416c72 Add userdata_renderer fix info to 2016.11.4 release notes 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
David Murphy
fd93caf206 Added further support for functionality on AIX for 2016.11.4 2017-04-04 13:57:37 -06:00
Mike Place
7a04ed2439 Merge pull request #40497 from DSRCorporation/features/39275_memcache 
Memcache documentation and minor updates.
 2017-04-04 13:55:17 -06:00
David Murphy
17b58917f2 Update release information for new AIX support 2017-04-04 13:51:14 -06:00
Erik Johnson
85b9bb4072 Fix label for RST link 2017-04-04 00:28:12 -05:00
Daniel Wallace
6e2f9080ca update docs for logging handlers 2017-04-03 16:04:53 -05:00
Thomas S Hatch
6279f7c120 fix do to pre correct on python randome function 2017-04-03 14:50:07 -06:00
Thomas S Hatch
66b9515af7 Fix up the doc for failover clarity 2017-04-03 13:24:56 -06:00
Dmitry Kuzmenko
82c45b1a52 Memcache documentation and minor updates. 2017-04-03 19:51:50 +03:00
rallytime
8111909bb1 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - doc/topics/master_tops/index.rst
  - salt/runners/saltutil.py
 2017-04-03 10:41:01 -06:00
Mike Place
bda781d8f9 Grammar fix 2017-03-31 14:02:48 -06:00
rallytime
d5576d75e7 Merge branch '2016.3' into '2016.11' 
Conflicts:
  - salt/crypt.py
 2017-03-30 12:21:44 -06:00
Erik Johnson
0d7b0c4ef0 Improve the master_tops documentation 2017-03-30 11:56:15 -05:00
Roald Nefs
21f161fecc fix Ubuntu notation in docs/faq.rst 
Fixed Ubuntu notation in docs/faq.rst: changed Ununtu to Ubuntu.
 2017-03-29 20:09:55 +02:00