Commit Graph

176 Commits

Author SHA1 Message Date
Colton Myers
57e187d46f Merge branch '2014.7' into develop
Conflicts:
	salt/modules/mount.py
2014-09-04 13:45:03 -06:00
rallytime
86be50c876 Add libcloud dependency notice to provider docs 2014-09-03 20:10:51 -06:00
Joseph Hall
e28468d930 Merge pull request #15342 from fly/li-pubkey
add support for ssh pubkey deployments using Linode
2014-09-02 08:30:52 -06:00
Jon Chen
c3d86fe44c also update other linode config doc 2014-08-27 23:27:52 -04:00
Jon Chen
f29fd0340e s/ssh_private_key/ssh_key_file 2014-08-27 23:25:08 -04:00
Jon Chen
33ddb0d451 document new ssh_private_key config value 2014-08-27 23:13:00 -04:00
Daniel Wallace
14d45a25d2 document ssh_agent 2014-08-27 21:40:05 -05:00
Jon Chen
86a2808b34 document possibility of ssh_pubkey 2014-08-27 20:14:24 -04:00
Robert Fairburn
235695ee19 Specify the version that interface properties were added in doc/topics/cloud/aws.rst 2014-08-27 14:02:01 -06:00
rallytime
0f4f68eddf Add --list-providers and --list-profiles to cloud docs 2014-08-26 00:18:57 -06:00
Kamal Nasser
c613c08869 Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-25 13:42:01 -06:00
Colton Myers
ad89a752f8 Merge branch '2014.7' into develop
Conflicts:
	salt/cloud/__init__.py
	salt/utils/cloud.py
2014-08-25 13:29:29 -06:00
rallytime
6d632d8f17 Update salt-cloud gce docs to use downloaded p12 key file 2014-08-24 12:15:04 -06:00
Joseph Hall
3571d3eb3c Cloud cache is now msgpack, not json 2014-08-22 13:22:25 -06:00
Seth House
b5bf67fdd1 Merge branch 'copyediting' of https://github.com/hulu/salt into develop
Conflicts:
	salt/states/win_update.py
2014-08-11 18:23:44 -04:00
Chris Rebert
177c168a21 Fix numerous typos found via Lintian
Thanks https://github.com/Debian/lintian/tree/master/data/spelling !
2014-08-11 10:46:43 -07:00
Nitin Madhok
41712eab04 Fixing more sphinx warnings and errors 2014-08-11 12:33:55 -04:00
Kamal Nasser
825bb191bf Replace all occurrences of "Digital Ocean" with "DigitalOcean" 2014-08-08 22:16:37 +03:00
Joseph Hall
94f82e0c82 Merge pull request #14849 from 7oku/patch-1
removed doubled "provider: azure" statement
2014-08-08 07:25:47 -06:00
7oku
bb7c60fff8 removed doubled "provider: azure" statement
needed once only
2014-08-08 14:55:19 +02:00
Sylvain Bellemare
54f97b3b06 Fixed typos 2014-08-08 14:39:28 +02:00
Daniel Wallace
45c13d621f document the usage of userdata for cloud-init
closes #14643
2014-08-04 11:25:20 -06:00
Daniel Wallace
77eaca180a document the usage of userdata for cloud-init
closes #14643
2014-08-03 13:38:38 -05:00
Colton Myers
9f7f02b3ac Merge branch '2014.7' into develop 2014-07-30 13:48:40 -06:00
rallytime
ea4b045944 Update docs for using salt-cloud on OSX to install curl-ca-bundle 2014-07-29 15:29:33 -06:00
Joseph Hall
f26ee8480b Merge pull request #14414 from gtmanfred/develop
use sftp to transfer files instead of scp
2014-07-23 08:12:57 -06:00
Daniel Wallace
53bc8f9c3c document use_sftp 2014-07-22 18:54:48 -05:00
Thomas S Hatch
024485fb36 Merge pull request #14204 from terminalmage/docs
Fix the rest of the double-colons in docs
2014-07-14 16:01:13 -06:00
Erik Johnson
57096ca59c Convert double-colon to code-block 2014-07-14 12:37:13 -05:00
Khris Richardson
1acd82f3f1 add sphinx spelling extension. enforce en_us 2014-07-13 13:43:33 -05:00
Hung Nguyen Viet
326cae6dbc add basic usage doc for salt-cloud 2014-07-10 18:06:43 +07:00
Hung Nguyen Viet
6fa10009c0 add document for installing salt-cloud on Ubuntu
as saying that salt cloud is merged to Salt may cause confusing
make user thinks no need to install salt-cloud pkg
2014-07-10 13:01:06 +07:00
rallytime
f0d9db2497 Removed the term "Hydrogen" from versionadded notation 2014-07-01 15:01:12 -06:00
Seth House
afde747f46 Merge pull request #13817 from rallytime/cloud_extends_docs
Clarify cloud configuration extends behaviors
2014-06-27 19:03:26 -06:00
rallytime
0636f2cb77 Clarify list merging and non-recursive behaviors of extends in cloud.config 2014-06-27 18:55:52 -06:00
Joseph Hall
9b5a6d575e Merge pull request #13790 from danielrowles-wf/ec2-secondary-ip-addresses
Add support for adding secondary IP addresses to network interfaces
2014-06-27 07:26:15 -06:00
Dan Rowles
329351313a Add support for adding secondary IP addresses to network interfaces
when provisioning EC2 instances with salt-cloud.
2014-06-26 20:29:15 +00:00
rallytime
7778a6e24d clarifications to gce cloud docs 2014-06-26 11:31:52 -06:00
rallytime
c482bf2e6c Update "Getting Started with Digital Ocean" docs to include ssh requirements 2014-06-24 14:47:00 -06:00
Erik Johnson
72711727b3 remove 2nd person pronoun 2014-06-16 21:19:32 -05:00
Erik Johnson
f915de5784 Add reminder about firewall to salt-cloud troubleshooting page 2014-06-16 17:29:08 -05:00
Erik Johnson
231aa4c5af Add target text for link 2014-06-09 11:07:17 -05:00
Erik Johnson
126c97a008 Alphabetically sort list of clouds 2014-06-09 11:06:32 -05:00
Joseph Hall
dcb3afdf5c Update formatting, point to profiles doc 2014-06-06 13:55:51 -06:00
Joseph Hall
755739146f Explain and remove script examples from profiles 2014-06-06 13:47:28 -06:00
Joseph Hall
a65ad31ddf Fix copy/paste errors in cloud.profile docs 2014-06-06 13:42:49 -06:00
Joseph Lorenzini
07e6c2ad5c removed tab characters from topic 2014-06-06 13:05:40 -05:00
Joseph Lorenzini
55f710d1af Merge remote-tracking branch 'salt/develop' into develop 2014-06-05 20:49:29 -05:00
Joseph Lorenzini
c25b58a0ea fixed minor typo in openstack topic 2014-06-05 20:44:35 -05:00
Joseph Lorenzini
bce3df7a63 added content to cloud provider section for openstack 2014-06-05 20:36:37 -05:00