Commit Graph

47 Commits

Author SHA1 Message Date
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
Colton Myers
95e70f0bef Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    salt/config.py
    salt/minion.py
    salt/modules/yumpkg.py
    salt/runners/ssh.py
    salt/states/git.py
    salt/states/http.py
2015-09-22 15:20:17 -06:00
Ben Hosmer
3ce77db1bc Fix typo in AWS doc config 2015-09-21 09:36:46 -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
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
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
0dba3feb63 Change provider config refernces to driver in docs 2015-06-17 16:41:03 -06:00
Edouard Bonlieu
908b27869d Add Getting Started for Scaleway provider 2015-06-04 16:23:06 +02: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
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
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
Joseph Hall
215a35c0ff Joyent now requires a keyname to be set 2015-02-19 14:52:08 -07:00
Thomas Jackson
8b635fe07d Comma Cleanup 2014-12-12 11:32:16 -08: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
Hung Nguyen Viet
7423369c55 use 2 spaces only 2014-10-30 11:53:18 +07:00
Joseph Hall
eed588f65b Merge pull request #16219 from steverweber/develop
remove s in clouds
2014-09-29 07:09:58 -06:00
Steve Weber
8290a473ca remove s in clouds
fix var name
2014-09-29 09:05:15 -04:00
Joseph Hall
9d6e4ff168 Get rid of Micro Instance examples 2014-09-27 11:09:08 -06:00
Wesley Lancel
407e48ae35 Add support for Digital Ocean's API v2 2014-09-16 17:16:14 +02:00
Jon Chen
c3d86fe44c also update other linode config doc 2014-08-27 23:27:52 -04:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Sylvain Bellemare
54f97b3b06 Fixed typos 2014-08-08 14:39:28 +02:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
rallytime
0636f2cb77 Clarify list merging and non-recursive behaviors of extends in cloud.config 2014-06-27 18:55:52 -06:00
Daniel Wallace
9bfdb1de72 We use cloud instead of clouds everywhere else 2014-05-20 18:32:19 -05:00
Daniel Wallace
19e791f31d space pillar data better 2014-05-20 17:59:36 -05:00
Daniel Wallace
4d54796c3c Document using Pillars for cloud config 2014-05-20 17:56:48 -05:00
C. R. Oldham
b00d3de63f Link in some other docs, correct typos, clarify some LXC config parameters. 2014-04-25 13:00:21 -06:00
Frank Klaassen
d397fcad58 Permissions 2014-03-22 18:59:15 +01:00
Frank Klaassen
33a3e089fa Doc improvements ... 2014-03-22 17:54:38 +01:00
Frank Klaassen
559b4baa35 Doc fixes 2014-03-22 17:53:07 +01: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
Joseph Hall
e8655a28ad IBM SCE is gone, let's get it out of Salt Cloud 2014-03-06 19:23:46 -07:00
Mathieu Le Marec - Pasquet
972efcaf37 salt.cloud.lxc: lxc provider 2014-03-06 16:09:39 +00:00
Chris Rebert
de5d0174e4 copyedit doc/topics/cloud/config.rst 2014-01-10 12:26:40 -08:00
Abe Music
b232dccdf7 Adding code example for pool size configuration 2014-01-10 12:38:02 -06:00
Abe Music
104d94cf7d Adding pool size doc; updating aws doc to include spot instance and EBS volume support 2014-01-10 12:16:51 -06:00
Joseph Hall
d17cbc8320 Adding getting started guides for digital ocean, gogrid and joyent 2013-11-22 19:57:39 -07:00
Seth House
e8bc71abe6 Added rST reference to Saltify core config docs 2013-11-19 11:10:32 -08:00
Seth House
e4f638e6d7 Moved salt-cloud documentation into main docs dir 2013-11-08 14:08:36 -07:00