rallytime
e4a8c585d0
Merge branch '2016.3' into 'develop'
...
Conflicts:
- salt/states/pkg.py
2016-07-05 13:11:32 -06:00
rallytime
8398de0baf
Merge branch '2015.8' into '2016.3'
...
No conflicts.
2016-06-30 16:08:57 -06:00
C. R. Oldham
6cce575d40
Clarify that salt-cloud doesn't get installed by bootstrap
2016-06-30 10:27:52 -06:00
rallytime
308aa5fd61
Merge branch '2016.3' into 'develop'
...
Conflicts:
- conf/master
- conf/minion
- doc/ref/proxy/all/index.rst
- salt/cli/daemons.py
- salt/modules/key.py
- salt/modules/reg.py
- salt/modules/win_pkg.py
- salt/utils/__init__.py
- salt/utils/cloud.py
- tests/unit/daemons_test.py
2016-03-18 10:57:15 -06:00
rallytime
fe7ff0ebfa
Merge branch '2015.8' into '2016.3'
...
Conflicts:
- salt/cloud/__init__.py
- salt/returners/smtp_return.py
2016-03-10 13:13:35 -07:00
Jacob Hammons
209c641a41
Made udpates as suggested by @rallytime
2016-03-09 11:00:27 -07:00
Jacob Hammons
26d4991cb3
moved previous intro to new quick start topic (topics/cloud/qs.rst)
...
added new intro that explains the salt cloud configuration files
added an inheritance and minion startup state example to topics/cloud/config.rst
2016-03-07 16:06:16 -07:00
LoveIsGrief
0eba4cdf17
Public documentation for salt-cloud virtualbox
2016-02-28 17:29:02 +01:00
Jacob Hammons
b192a9ba38
Doc restructuring, organization, and cleanup. Updated the doc navigation.
2016-01-31 20:10:02 -07:00
Colton Myers
307d3d05a4
Merge remote-tracking branch 'upstream/2015.8' into merge-forward-develop
...
Conflicts:
doc/man/salt.7
salt/modules/yumpkg.py
2015-09-03 14:24:45 -06:00
Colton Myers
1e1f5f3a95
Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
...
Conflicts:
doc/conf.py
doc/topics/cloud/config.rst
doc/topics/cloud/index.rst
salt/modules/git.py
salt/states/git.py
salt/states/pkgrepo.py
2015-09-01 15:35:21 -06:00
rallytime
d53754f2b7
Update Saltify docs to be more accurate and helpful
2015-08-31 12:02:23 -06:00
rallytime
f8c927f8b7
Add Getting Started with OpenNebula docs to Cloud Provider Specifics
2015-08-21 10:17:51 -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
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
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
b685ebc104
Add vSphere deprecation warnings to 2015.5
2015-06-08 10:22:50 -06:00
Nitin Madhok
ceac83dd59
Deprecating vsphere cloud driver in favor of vmware cloud driver
2015-06-07 17:53:33 -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
Nitin Madhok
3fa499fd1d
Adding Getting Started with VMware docs
2015-03-31 12:06:20 -04:00
Thomas Jackson
498a612078
Whitespace cleanup
...
Conflicts:
doc/topics/cloud/linode.rst
doc/topics/cloud/misc.rst
doc/topics/cloud/parallels.rst
doc/topics/cloud/proxmox.rst
Conflicts:
doc/topics/development/architecture.rst
doc/topics/development/translating.rst
2014-12-11 07:53:19 -08:00
Joseph Hall
4aadff6d2b
Add Reactor tutorial to index
2014-09-30 12:57:48 -06:00
Kamal Nasser
825bb191bf
Replace all occurrences of "Digital Ocean" with "DigitalOcean"
2014-08-08 22:16:37 +03:00
Hung Nguyen Viet
326cae6dbc
add basic usage doc for salt-cloud
2014-07-10 18:06:43 +07:00
Erik Johnson
126c97a008
Alphabetically sort list of clouds
2014-06-09 11:06:32 -05:00
Ray Chen
5ecfcad6a1
Forget to submit these files for aliyun documents
2014-05-24 15:38:14 +08:00
Seth House
59f2d07ffb
Bunch of misc rST fixes
2014-05-14 12:02:55 -06:00
C. R. Oldham
29aeb68f29
Reorganize salt-cloud TOC, begin updating lxc docs.
2014-04-24 15:29:05 -06:00
Mohammed Naser
f363338e67
Added documentation for VEXXHOST cloud
...
VEXXHOST provides a public cloud computing service that's based
on OpenStack in Canada.
The following patch provides documentation on how to use
salt-cloud with the VEXXHOST public cloud.
2014-04-22 21:05:03 -04:00
Frank Klaassen
7a82700098
Chmod files back to original
2014-03-22 17:47:54 +01:00
Frank Klaassen
9da568d7f9
Support for Proxmox in Salt-Cloud
2014-03-22 17:44:59 +01:00
CaptTofu
e6f51e4e5b
Added HP Cloud documentation
2014-03-11 10:18:28 -07:00
Mathieu Le Marec - Pasquet
972efcaf37
salt.cloud.lxc: lxc provider
2014-03-06 16:09:39 +00:00
Seth House
adaec101aa
Added ref anchor for salt-cloud docs
2014-02-27 19:38:57 -07:00
Mike Place
2637fc689f
Docs build cleanly! Yay!
2014-02-26 13:32:33 -07:00
Mike Place
6af7ff5dff
First pass at refactoring Salt documentation.
2014-02-26 13:31:11 -07:00
Joseph Hall
75c2bd46b4
As stupid of a rule as it is, "modeled" is correct
2014-01-26 20:20:28 -07:00
Alexey Ivanov
d23ff3821e
codespell: grammar nazi
...
Run codespell[1] against sources.
[1] https://github.com/lucasdemarchi/codespell
2014-01-26 18:41:28 -08:00
Erik Johnson
6ab77e5317
Replace references to Hydrogen release in docs
...
This replaces references to Hydrogen (in versionadded/versionchanged
directives as well as a few other mentions), to reflect the actual
release number of 2014.1.0.
2014-01-07 12:06:53 -06:00
Joseph Hall
cc40351668
Update sentence describing the getting started guides
2013-12-21 19:12:47 -07:00
Joseph Hall
d70690dbcb
Add doc about using Salt Cloud from Salt
2013-12-19 15:35:48 -07:00
Joseph Hall
8593da4048
L comes after J
2013-12-13 13:19:40 -07:00
Joseph Hall
3a0bbabb83
Put cloud providers in alphabetical order
2013-12-13 13:18:00 -07:00
Joseph Hall
18060f917d
Initial commit of the Azure cloud driver
2013-12-10 20:26:55 -07:00
Diego Woitasen
60c3be36dd
OpenStack salt-cloud documented.
2013-11-23 22:36:43 -03:00
Joseph Hall
051ec5bafb
Adding troubleshooting steps to the cloud index
2013-11-23 07:40:52 -07:00
Joseph Hall
d17cbc8320
Adding getting started guides for digital ocean, gogrid and joyent
2013-11-22 19:57:39 -07:00