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
92,245 Commits 24 Branches 182 Tags 341 MiB
2c4668a5cb
Commit Graph

754 Commits

Author SHA1 Message Date
rallytime
2c4668a5cb
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/modules/kubernetes.py
  - salt/states/netconfig.py
  - salt/states/zfs.py
  - tests/integration/cloud/providers/test_profitbricks.py
  - tests/integration/scheduler/test_eval.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-27 11:57:29 -04:00
cwlinode
8b8f9125cd
Update linode.rst 
Following this page to store profiles in `cloud.profiles.d/`, `salt-cloud -p linode_1024 linode-instance` returns the error below unless the profile is named with a `.conf` file extension.

```
[ERROR   ] Profile linode_1024 is not defined
Error:
    Profile linode_1024 is not defined
```
 2018-03-26 11:33:16 -04:00
rallytime
71178940e3
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/states/pip_state.py
  - salt/utils/schedule.py
 2018-03-16 15:09:16 -04:00
rallytime
8d1e1e7f94
Merge branch '2017.7' into '2018.3' 
Conflicts:
  - .kitchen.yml
  - Gemfile
  - pkg/windows/build_env_2.ps1
  - pkg/windows/build_env_3.ps1
  - pkg/windows/req.txt
  - salt/client/ssh/__init__.py
  - salt/client/ssh/ssh_py_shim.py
  - salt/modules/boto_vpc.py
  - salt/modules/file.py
  - salt/modules/heat.py
  - salt/modules/smartos_vmadm.py
  - salt/modules/win_dsc.py
  - salt/returners/elasticsearch_return.py
  - salt/runners/salt.py
  - salt/states/module.py
  - salt/utils/win_functions.py
  - setup.py
  - tests/integration/modules/test_state.py
  - tests/unit/grains/test_core.py
  - tests/unit/test_pillar.py
 2018-03-15 17:22:05 -04:00
rallytime
aa760334a1
Merge branch '2018.3.0rc1' into '2018.3' 
No conflicts.
 2018-03-13 10:58:28 -04:00
rallytime
651dcaff66
Merge branch '2018.3' into 'develop' 
Conflicts:
  - tests/integration/states/test_file.py
 2018-03-12 11:53:21 -04:00
nicholasmhughes
f82367289e
added the ability to send salt keys to the userdata script 2018-03-12 09:11:37 -04:00
Jochen Breuer
58836993dd
Fixed typo 
I think this should be whether instead of wither.
 2018-03-09 10:03:50 +01:00
Benjamin Drung
3d37eca847 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 19:14:42 +01:00
Benjamin Drung
a3c54b50f6 Fix various spelling mistakes 
lintian found various spelling mistakes.

Signed-off-by: Benjamin Drung <benjamin.drung@profitbricks.com>
 2018-03-08 15:25:42 +01:00
sumeetisp
c9127712d2
Change in profile parameter as per code 
In the code, del_all_vols_on_destroy is used and in documentation del_all_vol_on_destroy has been used. Hence there is a mismatch.
 2018-03-06 13:15:46 +05:30
Daniel Wallace
ac4133f432
Add getting started openstack doc 2018-03-05 16:25:08 -07:00
Nicole Thomas
5f88d64dc0
Merge pull request #46186 from nicholasmhughes/add-additional-azurearm-modules 
Add Additional Azure ARM Modules
 2018-03-02 16:49:07 -05:00
rallytime
ed46ce3c74
Merge branch '2018.3' into 'develop' 
Conflicts:
  - salt/auth/ldap.py
  - salt/modules/zfs.py
  - salt/modules/zpool.py
  - salt/states/cmd.py
  - salt/utils/schedule.py
  - tests/integration/scheduler/test_eval.py
  - tests/integration/scheduler/test_postpone.py
  - tests/unit/grains/test_core.py
 2018-03-02 11:55:06 -05:00
nicholasmhughes
2f984d7260
updated required azure module versions 2018-02-25 12:42:40 -05:00
Erik Johnson
1668a489c4
Update refrences to Oxygen codename to 2018.3.0 2018-02-21 21:47:41 -06:00
Nicole Thomas
6b4950857c
Merge pull request #45187 from nicholasmhughes/add-azurearm-govcloud-support 
Azure (ARM): Fix GovCloud Support
 2018-01-26 11:35:10 -05:00
nicholasmhughes
2d66c773ca
two linux profile examples, one with key and one with password 2018-01-25 13:03:06 -05:00
Ondřej Nový
137f4c21fd Fixed few typos in docs 2018-01-22 17:14:57 +01:00
Nicholas Hughes
573a85fc27
Merge branch 'develop' into add-azurearm-govcloud-support 2018-01-19 10:59:38 -05:00
denza
522cc4cee6 Doc update, ref should be used instead of doc 2017-12-28 23:13:57 +01:00
nicholasmhughes
e07c29f5fa
updated documentation for ssh private key parameter 2017-12-28 14:20:12 -05:00
nicholasmhughes
0ab05f7693
revert public key parameter name change in documentation 2017-12-28 13:47:15 -05:00
nicholasmhughes
f2650f48a3
update documentation 2017-12-28 13:39:18 -05:00
denza
3407b272c0 ProfitBricks CloudAPI v4 updates 2017-12-22 05:38:46 +01:00
Daniel Wallace
0568acf2f7
clean up global docs 2017-12-05 16:20:58 -07:00
Daniel Wallace
f7d182871e
remove openstack driver 2017-12-05 16:09:30 -07:00
BadgerOps
efc86b0eba fixed saltify documentation to refer to 'driver' instead of 'provider' in provider example 2017-12-05 10:38:53 -07:00
Vernon Cole
51a15cb2fc
try to ping node before Wake on Lan 2017-11-06 10:56:41 -07:00
Federico Pires
e7aebf46ce Support softlayer dedicated host in salt-cloud. 
Update docs as well.
 2017-10-25 10:58:12 -03:00
Vernon Cole
b7c0182d93
correct and clarify documentation 2017-10-20 09:24:26 -06:00
Vernon Cole
cea457efa0
more better documentation, fix parameter handling 2017-10-19 20:14:07 -06:00
Vernon Cole
d3769b3568
add saltify wake-on-lan and document it 2017-10-19 20:14:07 -06:00
Vernon Cole
805d5106ed
remove references to salt-api from docs 2017-10-18 10:50:47 -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
rallytime
c0f16dae74
Merge branch '2017.7' into 'develop' 
Conflicts:
  - doc/topics/tutorials/index.rst
  - salt/crypt.py
  - salt/modules/cmdmod.py
  - salt/modules/grains.py
  - salt/pillar/git_pillar.py
  - salt/roster/clustershell.py
  - tests/unit/states/test_augeas.py
  - tests/unit/utils/test_utils.py
 2017-10-16 15:26:19 -04:00
Erik Johnson
877abb89d0
Complete the salt.utils refactor 
This moves the remaining 30 functions from salt.utils to new locations.
 2017-10-15 09:43:31 -05:00
garethgreenaway
22dbed1e45 Merge branch 'develop' into vagrant-cloud 2017-10-13 13:08:50 -07:00
Nicole Thomas
0238a6d713 Merge pull request #44061 from Shinzu/develop 
Add option to eagerly scrub the disk
 2017-10-13 09:57:02 -04:00
Vernon Cole
42c0c6e6ef
lint and documentation fixes 2017-10-12 13:11:12 -06:00
Markus
820add5551
Added version tag 2017-10-12 20:30:55 +02:00
Markus Wyrsch
911ee5f361
Add option to eagerly scrub the disk 2017-10-12 13:43:27 +02:00
Ken Koch
067d4a5dd2 change tags to list based in config 2017-10-11 21:14:27 -04:00
Vernon Cole
4cdb04b409
documentation for vagrant cloud & state 2017-10-11 04:49:47 -06:00
rallytime
788ad0609a
Merge branch '2016.11' into '2017.7' 
No conflicts.
 2017-10-10 16:34:52 -04:00
Sébastien Santoro
15b8b8a9f4
Fix typo in salt-cloud scaleway documentation 
s/scalewa/scaleway
 2017-10-04 23:23:00 +00:00
Ken Koch
57a624d86b Add support for tagging newly created DigitalOcean droplets. 
Signed-off-by: Ken Koch <kkoch986@gmail.com>
 2017-10-01 07:53:07 -04:00
Daniel Wallace
3bae894306
digitalocean should be one word. 
Everything on their webpage is a reference to DigitalOcean
 2017-09-19 12:47:16 -06:00
Steven
e025b0cc92 Merge branch 'develop' into update_azurearm 2017-08-23 00:22:33 +10:00
rallytime
6ca3607770 Merge branch '2017.7' into 'develop' 
Conflicts:
  - salt/engines/slack.py
  - salt/modules/win_pkg.py
  - salt/utils/versions.py
 2017-08-18 09:28:26 -04:00