Commit Graph

22 Commits

Author SHA1 Message Date
Erik Johnson
73f4c43e2a Allow for userdata_template to be disabled in a cloud_profile
This handles the case where a global value has been set and it is
necessary to disable it for a single profile.
2017-04-04 15:41:43 -05:00
Erik Johnson
b580654f85 Update cloud docs to reflect userdata_renderer -> userdata_template 2017-04-04 15:41:43 -05:00
Erik Johnson
111188742a Add documentation for userdata_renderer 2017-04-04 15:40:50 -05:00
Drew Adams
f15ce68097 change OpenSuse to openSUSE 2016-05-26 22:11:20 -07:00
Drew Adams
bcd6a1cd77 fix osfamily from Suse to SUSE 2016-05-26 22:08:40 -07:00
Trevor Hammond
48e0edd0d2 Fixes #29187 - using winrm on EC2 2015-11-25 18:36:45 +00:00
Colton Myers
274464a85b Merge remote-tracking branch 'upstream/2015.5' into merge-forward-2015.8
Conflicts:
    doc/topics/reactor/index.rst
    salt/cloud/clouds/digital_ocean_v2.py
    salt/modules/groupadd.py
    salt/modules/localemod.py
    salt/modules/mysql.py
    salt/modules/useradd.py
    salt/modules/win_pkg.py
    salt/modules/win_useradd.py
    salt/netapi/rest_cherrypy/app.py
    salt/pillar/s3.py
    salt/returners/local_cache.py
    salt/states/htpasswd.py
    salt/states/user.py
2015-09-14 14:39:03 -06:00
TheBigBear
6a29eac003 URL has changed
the saltstack windows download area has moved over to https on https://repo.saltstack.com/windows/
2015-09-09 08:59:19 -06:00
rallytime
0dba3feb63 Change provider config refernces to driver in docs 2015-06-17 16:41:03 -06:00
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
Jacob Hammons
0689815d0e Fixes for doc build errors 2015-05-27 11:40:31 -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
Rudy Attias
f733bfc7b0 added an example usage of smb_port 2015-03-26 17:31:38 +02:00
Joseph Hall
bc58c569ab Update docs for impacket dep 2014-12-17 11:45:49 -07: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
Erik Johnson
3ed0996a90 Miscellaneous docs fixes
Formatting, quieting build errors, etc.
2014-02-03 22:11:56 -06:00
Seth House
2e3ddbf4c1 Updated bad link to Windows downloads in the salt-cloud docs 2013-11-14 09:57:14 -07:00
Seth House
a566e2829c Revert inline links to anonymous link targets, but with valid rST
@s0undt3ch reports this syntax is better for translations.
2013-11-11 00:29:54 -07:00
Seth House
d379371aa7 Fixed misc rST syntax 2013-11-08 15:08:33 -07:00
Seth House
e4f638e6d7 Moved salt-cloud documentation into main docs dir 2013-11-08 14:08:36 -07:00