valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-07 08:58:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
59,730 Commits 24 Branches 182 Tags 341 MiB
6922da46dc
Commit Graph

392 Commits

Author SHA1 Message Date
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
Nitin Madhok
99bc6c9a49 Add some more examples for extra_config to documentation 2015-04-06 18:04:53 -04:00
Nitin Madhok
a659a39f18 Add some more examples for extra_config to documentation 2015-04-06 18:00:02 -04:00
Nitin Madhok
3746d37293 Adding ability to vmware cloud create() so extra_config can be specified. 2015-04-06 17:52:47 -04:00
Nitin Madhok
e106574d24 Doc changes and enhancements 2015-04-05 16:46:48 -04:00
Nitin Madhok
c68a7cb2db Grammar correction in sentence 2015-04-04 17:49:44 -04:00
Nitin Madhok
4b7ac72352 Adding versionadded to docs and author 2015-04-04 17:25:27 -04:00
Nitin Madhok
28fa708cbb Adding docs to be able to specify network adapter settings 2015-04-04 17:04:07 -04:00
rallytime
eac4c63990 Add list_node docs to Cloud Function page 2015-04-03 16:30:58 -06:00
rallytime
bf31daa82e Add Feature Matrix link to cloud action and function pages 2015-04-03 16:15:50 -06:00
rallytime
d5fa02d566 Add list_node* functions to feature matrix 2015-04-03 15:59:16 -06:00
Nitin Madhok
4203c1e349 Adding functionality to create to be able to add/reconfigure hard disks 2015-04-03 16:03:52 -04:00
Nitin Madhok
5a5f394eba Forgot to remove trailing spaces 2015-04-02 06:56:49 -04:00
Nitin Madhok
2a7c23ec83 Fixing lint and formatting docs 2015-04-02 06:28:32 -04:00
Nitin Madhok
1e2a8c1a36 Adding more options that can be specified in create and docs for them 2015-04-01 14:42:58 -04:00
Nitin Madhok
4d6ac06947 Adding ability to specify and override the default vCPUS and memory 2015-04-01 05:54:52 -04:00
Nitin Madhok
50f96bc389 Doc fixes 2015-03-31 14:25:53 -04:00
Nitin Madhok
931ece7d20 Fixing some spninx errors and violations 2015-03-31 12:54:32 -04:00
Nitin Madhok
3fa499fd1d Adding Getting Started with VMware docs 2015-03-31 12:06:20 -04:00
Nitin Madhok
3d501b7a66 Docs fixes and adding VMware to core config docs 2015-03-31 11:23:36 -04:00
Thomas S Hatch
45827bc933 Merge pull request #22060 from techhat/blobstorage 
Add azurefs external file server and supporting code and docs
 2015-03-26 17:12:19 -06:00
Joseph Hall
6ac0bcd2e4 Update docs for Azure blob management 2015-03-26 15:12:33 -06:00
Rudy Attias
f733bfc7b0 added an example usage of smb_port 2015-03-26 17:31:38 +02:00
Joseph Hall
5686e64149 Adding docs for new Azure functionality 2015-03-17 21:58:19 -06:00
Colton Myers
fd93491a5f Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	salt/cloud/clouds/linodepy.py
	salt/master.py
	salt/modules/boto_route53.py
	salt/modules/virt.py
	salt/renderers/gpg.py
	salt/runners/doc.py
	salt/runners/jobs.py
	salt/runners/manage.py
	salt/runners/virt.py
	salt/utils/event.py
	salt/utils/http.py
 2015-03-16 15:12:02 -06:00
Colton Myers
a983f1b611 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	salt/modules/win_ntp.py
	salt/templates/rh_ip/rh5_eth.jinja
	salt/templates/rh_ip/rh6_eth.jinja
	setup.py
 2015-03-13 17:02:19 -06:00
rallytime
01c8f94b31 Add minimum version dependency for linode-python in docs 
And warn users of older versions leaking sensitive information
into the debug logs.
 2015-03-13 11:53:02 -06:00
Colton Myers
ebe7eeafd9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 
Conflicts:
	doc/conf.py
	doc/man/salt-api.1
	doc/man/salt-call.1
	doc/man/salt-cloud.1
	doc/man/salt-cp.1
	doc/man/salt-key.1
	doc/man/salt-master.1
	doc/man/salt-minion.1
	doc/man/salt-run.1
	doc/man/salt-ssh.1
	doc/man/salt-syndic.1
	doc/man/salt-unity.1
	doc/man/salt.1
	doc/man/salt.7
	salt/cloud/clouds/linode.py
	salt/states/composer.py
	salt/states/win_update.py
 2015-03-11 15:14:56 -06:00
Colton Myers
d17c908b42 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/pillar/index.rst
	salt/beacons/diskusage.py
	salt/beacons/network_info.py
	salt/minion.py
	salt/modules/iptables.py
	salt/modules/nacl.py
	salt/modules/win_firewall.py
 2015-03-09 12:52:14 -06:00
James Lamb
f18dc55ccb Merge branch 'develop' of https://github.com/jimmystewpot/salt into develop 2015-03-06 15:12:55 +11:00
James Lamb
ae1728ec4f Update documentation to include how to set a static IP within the VPC for aws/ec2 2015-03-06 15:10:02 +11:00
rallytime
e9402e7564 Remove "Lithium" and change to "2015.2.0" for versionadded tags 2015-03-05 12:44:22 -07:00
Nitin Madhok
b9cdd2b089 Replacing provider aws with ec2 fixes #21274 2015-03-04 20:49:00 -05:00
Seth House
1399949196 Merge remote-tracking branch 'upstream/2015.2' into develop 2015-03-02 14:19:37 -07:00
C. R. Oldham
f171df4311 Merge forward 2015.2->develop 2015-03-01 19:54:22 -07:00
Fred Reimer
883e4d1d1a
Added win_deploy_auth_retries and win_deploy_auth_retry_delay for ec2 cloud 2015-02-28 17:08:44 -05:00
C. R. Oldham
d19937eca2 Add docs for linode cloud driver 2015-02-28 12:23:22 -07:00
Fred Reimer
f94a3cbe2b Fix quote 2015-02-25 22:57:05 -05:00
Fred Reimer
376e4a6e79 Added documentation information concerning the ability to use instance role credentials 2015-02-25 22:51:45 -05:00
Colton Myers
c8eb2d4665 Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 
Conflicts:
	doc/topics/installation/windows.rst
	salt/cloud/clouds/joyent.py
	salt/daemons/flo/core.py
	salt/minion.py
 2015-02-23 14:25:51 -07:00
Christian Page
309f977d5e Add 'Getting Started With vSphere' documentation 2015-02-22 10:31:42 -07:00
Joseph Hall
215a35c0ff Joyent now requires a keyname to be set 2015-02-19 14:52:08 -07:00
Justin Findlay
dae5e2ddc6 Merge remote-tracking branch 'salt/2014.7' into 2015.2 
Conflicts:
	doc/topics/reactor/index.rst
	salt/modules/publish.py
	salt/modules/systemd.py
	salt/payload.py
 2015-02-18 11:33:10 -07:00
Wes Childs
020b8698ec Added required update 2015-02-17 14:32:21 +00:00
rallytime
4805677d0c Add dependency notice to proxmox.rst 
Refs #14799
 2015-02-13 09:14:41 -07:00
Colton Myers
9446633e9d Merge remote-tracking branch 'upstream/2015.2' into merge-forward-develop 2015-01-21 12:05:51 -07:00
Joseph Hall
667473c72c Modify how joyent driver handles SSL and URLs 2015-01-21 08:29:06 -07:00
Joseph Hall
27adbbe8aa Revert "Allow joyent api host suffix to be configurable" 2015-01-21 08:05:45 -07:00
Todd Wells
99114eeeeb cloud timeout doc updates 2015-01-16 12:37:28 -08:00
Joseph Hall
11d802d873 Allow joyent api host suffix to be configurable 2015-01-13 07:32:02 -07:00
twellspring
f8883cebdd Add private subnets 
Added how to enable rackspace private subnets on servers instantiated by salt cloud
 2015-01-02 19:28:45 -08:00
Joseph Hall
bc58c569ab Update docs for impacket dep 2014-12-17 11:45:49 -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
Joseph Hall
25d8cb6560 Copy fixes for Windows Salt Cloud doc 2014-12-09 11:57:35 -07:00
Joseph Hall
790cd28ff1 Update Windows docs for auto-generated Windows passwords 2014-12-08 14:23:05 -07:00
Benoit Beausejour
680689e78a Updated documentation for GCE: 
- Support for fixed address
  - New salt function for create_address, delete_address, show_address
 2014-12-02 15:38:00 -05:00
Colton Myers
fcc2196a5f Merge branch '2014.7' into merge-forward 
Conflicts:
	salt/cloud/__init__.py
	salt/modules/boto_secgroup.py
	salt/modules/boto_vpc.py
	salt/modules/file.py
	salt/modules/zcbuildout.py
	salt/runner.py
	salt/runners/lxc.py
	salt/runners/manage.py
	salt/utils/schedule.py
	tests/unit/modules/boto_vpc_test.py
	tests/unit/modules/hashutil_test.py
	tests/unit/templates/jinja_test.py
 2014-12-01 15:04:03 -07:00
Tim O'Guin
39fb372898 fixed allocate_new_eip typo in AWS cloud docs 2014-12-01 14:46:32 -06:00
jmdcal
5e2bbe363a fixed confusion 
Here it says clearly : http://salt-cloud.readthedocs.org/en/latest/topics/aws.html

EC2 instances can have a public or private IP, or both. When an instance is deployed, Salt Cloud needs to log into it via SSH to run the deploy script. By default, the public IP will be used for this. If the salt-cloud command is run from another EC2 instance, the private IP should be used.

my-ec2-config:
  # Specify whether to use public or private IP for deploy script
  # private_ips or public_ips
  ssh_interface: public_ips
 2014-11-19 12:32:07 -06:00
Dylan Fitzgerald
611baf468a Correct data in /srv/reactor/startup_highstate.sls 
data['id'] does not exist; data['name'] does. revise example sls to render correctly.
 2014-11-05 13:23:43 -07:00
Hung Nguyen Viet
7423369c55 use 2 spaces only 2014-10-30 11:53:18 +07:00
Thomas S Hatch
1638e58245 Merge branch 'master' of https://github.com/jimmystewpot/salt into jimmystewpot-master 
Conflicts:
	doc/topics/cloud/aws.rst
 2014-10-23 13:29:24 -06:00
jimmystewpot
271f6c4257 Update aws.rst 
remove note it was a typo
 2014-10-21 16:20:46 +11:00
jimmystewpot
8fd88cc0d3 Update aws.rst 
Updated the document to reflect a storage type that would work. Currently only gp2 and standard function because there is no support for the provisioned iops
 2014-10-21 16:18:31 +11:00
jimmystewpot
9edaf65bbe Update aws.rst 
added additional component for Ebs.
 2014-10-21 15:59:02 +11:00
jimmystewpot
abd8437205 Update aws.rst 
Added undocumented feature for Ebs.VolumeType to the example so people do not need to read the source to identify how to change the EBS volume Type:
 2014-10-21 15:57:42 +11:00
Joseph Hall
d65d12a460 Correct formatting of PagerDuty 2014-10-02 13:27:13 -06:00
Joseph Hall
4aadff6d2b Add Reactor tutorial to index 2014-09-30 12:57:48 -06:00
Joseph Hall
dc88103cdf Add tutorial on using Salt Cloud with the Event Reactor 2014-09-30 12:50:47 -06: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
Colton Myers
99e97320e1 Merge branch '2014.7' into develop 
Conflicts:
	doc/ref/configuration/minion.rst
	doc/ref/states/requisites.rst
	doc/topics/troubleshooting/master.rst
	doc/topics/tutorials/index.rst
	doc/topics/tutorials/intro_scale.rst
	salt/config.py
	salt/key.py
	salt/master.py
	salt/minion.py
	salt/modules/file.py
	salt/modules/hashutil.py
	salt/modules/lxc.py
	salt/modules/oracle.py
	salt/modules/tls.py
	salt/modules/win_update.py
	salt/pillar/pepa.py
	salt/pillar/s3.py
	salt/states/augeas.py
	salt/states/win_update.py
	salt/tops/ext_nodes.py
	salt/utils/master.py
 2014-09-22 14:22:54 -06:00
rallytime
9a4f9e6fae Clarify region settings in ec2 config docs 2014-09-17 16:16:35 -06:00
Joseph Hall
9466dba1ce Merge pull request #15835 from wesleylancel/digital-ocean-api-v2 
Add support for Digital Ocean's API v2
 2014-09-17 14:07:29 -06:00
Erik Johnson
111a09f2ad Merge remote-tracking branch 'upstream/2014.7' into develop 
Conflicts:
	salt/minion.py
	salt/output/nested.py
 2014-09-16 18:46:48 -05:00
Wesley Lancel
407e48ae35 Add support for Digital Ocean's API v2 2014-09-16 17:16:14 +02:00
rallytime
3e488df321 Cleanup azure docs 2014-09-15 15:50:43 -06:00
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