Commit Graph

346 Commits

Author SHA1 Message Date
Nitin Madhok
702b55f2ca Adding ability to specify the virtual hardware version when creating VM 2015-08-19 21:05:12 -04:00
Colton Myers
1b0b21394e Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
Conflicts:
    salt/cloud/clouds/vmware.py
    salt/modules/win_system.py
2015-08-10 13:27:31 -06:00
Nicole Thomas
22705c5222 Merge pull request #26143 from nmadhok/vmware-cloud-fixes-2015.8
VMware cloud driver fixes [forward port from 2015.5 into 2015.8]
2015-08-10 10:17:59 -06:00
Jacob Hammons
d8d5045d3b Updates to cloud docs for the provider > driver change in provider configs.
Refs #24797
2015-08-10 09:20:26 -06:00
Nitin Madhok
8899950564 Correct provider name in profile example 2015-08-09 11:48:31 -04:00
Nitin Madhok
194f2b9ba7 Correct provider name in profile example 2015-08-09 11:48:04 -04:00
Nitin Madhok
b699e0cf47 Change all provider references to driver 2015-08-09 11:47:14 -04:00
Nitin Madhok
2e3a14d02c Change all provider references to driver 2015-08-09 11:43:04 -04:00
Colton Myers
d8c5dfb33f Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop 2015-07-30 16:58:19 -06:00
Nicole Thomas
13c2377e95 Merge pull request #25764 from gtmanfred/2015.8
allow use of cloudnetworks in ssh_interface
2015-07-27 20:40:06 -06:00
Daniel Wallace
51859396d4 add a note in the documentation for openstack
about the cloud networks in ssh_interfaces
2015-07-27 16:01:35 -05:00
rallytime
4ea41a3b12 Added "Getting Started with OpenNebula" doc 2015-07-27 13:01:47 -06:00
Colton Myers
76e468bc20 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/cloud/vmware.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/cloud/clouds/vmware.py
    salt/daemons/flo/core.py
    salt/modules/hipchat.py
    salt/modules/lxc.py
    salt/modules/rabbitmq.py
    salt/pillar/s3.py
    salt/states/dockerio.py
    salt/states/file.py
    salt/utils/process.py
    salt/utils/s3.py
2015-07-20 13:55:14 -06:00
rallytime
35e13eef1d Don't reference driver in older salt versions 2015-07-17 11:00:57 -06:00
rallytime
0f4f560b38 Backport vmware driver to 2015.5 branch 2015-07-17 10:53:42 -06:00
jacobhammons
cd405b440e Merge pull request #25257 from notpeter/SourceDestCheck
Document SourceDestCheck added in #25242.
2015-07-09 17:29:48 -06:00
C. R. Oldham
58ca83cda1 Merge pull request #25254 from rallytime/change_beryllium_refs
Change versionadded/changed references from Beryllium to 2015.8.0
2015-07-09 15:01:15 -06:00
Colton Myers
3a7289a0cb Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/ref/states/all/salt.states.aptpkg.rst
    doc/ref/states/all/salt.states.etcd_mod.rst
    doc/topics/releases/releasecandidate.rst
    salt/client/mixins.py
    salt/modules/win_pkg.py
    tests/unit/modules/boto_vpc_test.py
2015-07-08 16:24:58 -06:00
Peter Tripp
72323fcac9 Document SourceDestCheck added in #25242. 2015-07-08 12:31:36 -07:00
rallytime
1b7efa91e0 Remove references to Beryllium in relevant docs 2015-07-08 11:17:01 -06:00
Tom Melendez
4078c8db25 added message recommending JSON file be used if the libcloud version is >= 0.17.0 2015-07-06 10:07:16 -06:00
rallytime
4ac8a9460a Add minimum Python Azure SDK verion to azure docs. 2015-06-25 15:26:50 -06:00
Julien Barbot
6d7e779e62 Fix typo in salt-cloud reactor section 2015-06-24 16:40:32 +02:00
rallytime
b3ef394abe Clean up 2015-06-19 16:17:56 -06:00
rallytime
ddab875177 Update linode rest driver docs 2015-06-19 16:15:13 -06:00
rallytime
e2684ecf0b Add notes to map and gogrid docs -- don't use -P with map files 2015-06-19 11:02:06 -06:00
Joseph Hall
d299475d34 Merge pull request #24796 from rallytime/deprecate_provider_for_driver
Deprecate using "provider" in favor of "driver" in cloud provider files
2015-06-19 09:43:26 -06:00
rallytime
5c5dfc557b More aws --> ec2 references 2015-06-18 16:12:13 -06:00
rallytime
4de5afbe53 Replace references to aws with ec2 2015-06-18 16:06:57 -06:00
rallytime
d045fb579e Add notes to map and gogrid docs -- don't use -P with map files 2015-06-18 14:25:20 -06:00
Colton Myers
a5c9681672 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/topics/releases/version_numbers.rst
    salt/cli/batch.py
    salt/minion.py
    salt/state.py
    setup.py
2015-06-18 11:43:11 -06:00
rallytime
404268286a Add provider --> driver change to release notes 2015-06-18 10:14:02 -06:00
rallytime
0dba3feb63 Change provider config refernces to driver in docs 2015-06-17 16:41:03 -06:00
Andreas Lutro
d88e071e98 add information about linode location 2015-06-17 17:43:08 +02:00
Joseph Hall
b4dd2c40c6 Add versionadded 2015-06-16 15:52:18 -06:00
Joseph Hall
fb7957b730 Update docs for GoGrid 2015-06-16 15:42:40 -06:00
Colton Myers
94d6ef1d17 Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/states/all/salt.states.tls.rst
    doc/topics/cloud/index.rst
    doc/topics/cloud/vsphere.rst
    doc/topics/eauth/index.rst
    salt/cli/batch.py
    salt/modules/cmdmod.py
    salt/modules/ipmi.py
    salt/netapi/rest_cherrypy/app.py
    salt/runners/http.py
    salt/states/boto_elb.py
    salt/states/dockerio.py
    salt/states/linux_acl.py
    salt/states/win_servermanager.py
    salt/wheel/config.py
2015-06-09 11:41:07 -06:00
Nicole Thomas
87e1c6008c Merge pull request #24459 from basepi/merge-forward-develop
Merge forward from 2015.5 to develop
2015-06-08 22:27:08 -06:00
rallytime
d876535d71 Add Getting Started with VSphere doc to 2015.5 2015-06-08 10:23:47 -06:00
rallytime
b685ebc104 Add vSphere deprecation warnings to 2015.5 2015-06-08 10:22:50 -06:00
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
Colton Myers
6d503c12ea Merge remote-tracking branch 'upstream/2015.5' into merge-forward-develop
Conflicts:
    doc/ref/modules/all/salt.modules.ipmi.rst
    doc/ref/modules/all/salt.modules.system_profiler.rst
    salt/fileclient.py
    salt/loader.py
    salt/modules/tls.py
    salt/modules/win_path.py
    salt/states/pkg.py
    salt/utils/event.py
    salt/utils/pagerduty.py
    tests/unit/modules/seed_test.py
2015-06-05 13:03:48 -06:00
Jacob Hammons
1f7a13d6f9 Salt cloud doc updates, build errors and bug fixes
Refs #24309
2015-06-04 16:42:47 -06: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