Thomas S Hatch
6c4cef2324
Merge pull request #24478 from nmadhok/vmware-cloud-driver
...
Vmware cloud driver additions and refactors
2015-06-08 09:27:37 -06:00
Nitin Madhok
ceac83dd59
Deprecating vsphere cloud driver in favor of vmware cloud driver
2015-06-07 17:53:33 -04:00
Nitin Madhok
94ebd4bc63
Show same examples for memory
2015-06-07 04:21:07 -04:00
Nitin Madhok
e7b855f9ca
adding docs for ability to specify memory in mb and gb
2015-06-07 04:18:53 -04:00
Edouard Bonlieu
908b27869d
Add Getting Started for Scaleway provider
2015-06-04 16:23:06 +02:00
Colton Myers
baf4337918
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
salt/roster/clustershell.py
2015-06-03 13:47:08 -06:00
rallytime
a235b114d7
Remove references to mount_points in ec2 docs
...
Fixes #14021
2015-06-02 16:32:26 -06:00
Colton Myers
288d49e51c
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/ipmi.py
2015-06-02 15:51:50 -06:00
Joseph Hall
ca535a6ff4
Add warning about destroying maps
2015-06-01 15:25:58 -06:00
Colton Myers
5fcbcfe6d5
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/cloud/digitalocean.rst
doc/topics/tutorials/index.rst
salt/cloud/clouds/digital_ocean.py
salt/modules/lxc.py
salt/returners/__init__.py
2015-05-29 17:33:28 -06:00
Thomas S Hatch
742cf7e4dd
Merge pull request #24256 from rallytime/remove_digital_ocean_v1
...
Deprecate digital_ocean.py in favor of digital_ocean_v2.py
2015-05-29 17:09:12 -06:00
Colton Myers
75590cf490
Merge pull request #24080 from makinacorpus/lxc_consistency2
...
Lxc consistency2
2015-05-29 16:51:54 -06:00
Colton Myers
c4f5e231fa
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop2
...
Conflicts:
doc/_themes/saltstack2/layout.html
doc/conf.py
doc/index.rst
doc/ref/modules/all/salt.modules.hipchat.rst
doc/topics/releases/index.rst
salt/client/ssh/client.py
salt/cloud/clouds/vsphere.py
salt/modules/boto_dynamodb.py
salt/modules/boto_route53.py
salt/modules/data.py
salt/modules/http.py
salt/modules/tls.py
salt/output/compact.py
salt/states/boto_elb.py
salt/states/linux_acl.py
salt/states/rabbitmq_user.py
salt/states/win_servermanager.py
salt/utils/dictupdate.py
salt/wheel/config.py
2015-05-29 15:10:13 -06:00
rallytime
c10453e844
Deprecate digital_ocean.py in favor of digital_ocean_v2.py
...
The removes support for the original digital_ocean.py driver in salt-cloud
and replaces the original digital_ocean.py driver with the digital_ocean_v2.py
driver. The digital_ocean_v2.py driver is renamed to just digital_ocean.py.
2015-05-29 14:32:42 -06:00
rallytime
8d51f75aa5
Clarify digital ocean documentation and mention v1 driver deprecation
...
Fixes #21498
2015-05-29 14:14:19 -06:00
Jacob Hammons
0689815d0e
Fixes for doc build errors
2015-05-27 11:40:31 -06:00
thanhnt
e1d06f9764
fix code block syntax
2015-05-26 08:57:46 -06:00
Mathieu Le Marec - Pasquet
ef1f95231a
lxc docs: typos
2015-05-23 14:49:34 +02:00
Mathieu Le Marec - Pasquet
d67a43dc1f
more lxc docs
2015-05-23 14:45:43 +02:00
Mathieu Le Marec - Pasquet
ce11d8352e
lxc: Global doc refresh
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-22 23:21:13 +02:00
thanhnt
01b546e6e8
fix code block syntax
2015-05-23 00:57:42 +07:00
Colton Myers
8f53adb4e6
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
salt/modules/lxc.py
2015-05-19 15:12:54 -06:00
Mathieu Le Marec - Pasquet
80eabe2703
lxc salt cloud doc
...
Signed-off-by: Mathieu Le Marec - Pasquet <kiorky@cryptelium.net>
2015-05-19 20:27:55 +02:00
jpic
a4bcd75171
Fixed wrong path in LXC cloud documentation
2015-05-19 18:54:07 +02:00
Joseph Hall
bbec34abd3
Allow Salt Cloud to use either SCP or SFTP, as configured
2015-05-14 10:49:20 -06:00
Joseph Hall
d4b3518444
Allow Salt Cloud to use either SCP or SFTP, as configured
2015-05-12 02:05:27 -06:00
Nitin Madhok
46dd8816f5
Merge branch 'develop' of https://github.com/saltstack/salt into vmware-cloud-driver
2015-05-09 01:40:42 -04:00
Nitin Madhok
3b9a41d06f
Adding port and protocol to the Getting started docs
2015-05-09 01:26:51 -04:00
Colton Myers
1bf2ff994e
Merge pull request #23430 from basepi/merge-forward-develop
...
Merge forward from 2015.5 to develop
2015-05-08 16:46:21 -06:00
Bogdan Radulescu
4f19852587
Made some claridications in the AWS provider for salt-cloud
2015-05-08 17:50:24 +03:00
Nitin Madhok
4a3f3bd709
Make sure the provider config field values are quoted Fixes #23360
2015-05-06 19:01:42 -04:00
Nitin Madhok
93b664d2f4
Fixes
2015-05-06 18:52:44 -04:00
Colton Myers
ece63c36a3
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
...
Conflicts:
doc/topics/ssh/roster.rst
salt/modules/win_groupadd.py
2015-05-06 15:49:50 -06:00
Nitin Madhok
6184fcdfaa
Doc fix
2015-05-06 17:38:04 -04:00
Nitin Madhok
bd57a99c28
Adding docs to be able to create/reconfigure new CD/DVD drives Fixes #23231
2015-05-06 17:32:03 -04:00
Erik Johnson
0504e7a184
Update Lithium docstrings in 2015.2 branch
2015-05-06 11:01:53 -06:00
Nitin Madhok
49f5789934
VMware cloud driver doc fixes
2015-05-03 16:14:07 -04:00
Nitin Madhok
dc7903b110
Adding support to be able to add distributed virtual portgroup to vm upon creation
2015-04-30 21:34:31 -04:00
Nitin Madhok
64e527c4dc
Adding ability to modify/create SCSI adapters #22364
2015-04-18 17:09:11 -04:00
Colton Myers
000de95974
Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop
...
Conflicts:
.pylintrc
doc/ref/runners/all/salt.runners.nacl.rst
doc/topics/cloud/config.rst
salt/cli/salt.py
salt/client/mixins.py
salt/client/ssh/__init__.py
salt/loader.py
salt/minion.py
salt/modules/cassandra_cql.py
salt/modules/gpg.py
salt/modules/grains.py
salt/modules/iptables.py
salt/modules/yumpkg.py
salt/netapi/rest_cherrypy/app.py
salt/renderers/pyobjects.py
salt/returners/mysql.py
salt/runners/jobs.py
salt/state.py
salt/states/file.py
salt/states/service.py
salt/utils/minions.py
tests/integration/__init__.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/states/cmd.py
2015-04-16 12:15:44 -06:00
Colton Myers
9099884809
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/config.rst
salt/modules/win_disk.py
salt/modules/yumpkg.py
salt/pillar/s3.py
salt/states/service.py
salt/utils/event.py
tests/integration/netapi/rest_tornado/test_app.py
tests/integration/netapi/test_client.py
tests/unit/states/archive_test.py
2015-04-14 11:03:03 -06:00
Alexander Backlund
b7db2080d8
add initial support for WinRM in Windows cloud deployment
...
fixes saltstack/salt#15984
2015-04-13 16:03:37 -04:00
Nitin Madhok
4ab84a6bca
Adding some documentation
2015-04-10 17:39:30 -04:00
Joseph Hall
aa23eb0e26
Merge pull request #22448 from rallytime/migrate_old_cloud_config_docs
...
Migrate old cloud config documentation to own page
2015-04-08 12:32:35 -06:00
Colton Myers
5f1a4b45b8
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
2015-04-08 10:38:34 -06:00
rallytime
cecca10668
Kill legacy cloud configuration syntax docs per techhat
2015-04-07 20:09:37 -06:00
rallytime
52a3d500e8
Beef up cloud configuration syntax and add pillar config back in
2015-04-07 18:56:40 -06:00
rallytime
9b5318fe71
Move old cloud syntax to "Legacy" cloud config doc
2015-04-07 18:41:21 -06:00
rallytime
7a9ce92dd9
Add docs explaing file_map upload functionality
...
Fixes #16886
2015-04-07 17:23:02 -06:00
Colton Myers
25f9b2d2d1
Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
...
Conflicts:
doc/topics/cloud/action.rst
doc/topics/cloud/function.rst
doc/topics/reactor/index.rst
2015-04-07 10:05:35 -06:00
