Commit Graph

4032 Commits

Author SHA1 Message Date
Erik Johnson
396e234848 Update the RHEL installation guide
This updates the RHEL install instructions to reflect the new COPR for
installation on RHEL/CentOS 5.

Additionally, it provides better instructions on how to enable EPEL:

- We don't care about EPEL5, so this link has been removed.
- We needed a link for EPEL7, so this has been added.
- The old RPM installation example used hard-coded URLs to an arbitrary
  EPEL mirror. This is not a good idea since A) the mirror could go
  away, and B) we are unfairly sending people to a single mirror when
  the Fedora Project has a perfectly good link on their wiki to send
  people to a "random" mirror. The install example now uses these links.
2015-02-20 11:59:19 -06:00
Joseph Hall
0ff1d027ab Add Joyent keyname note to release notes 2015-02-19 14:55:13 -07:00
Joseph Hall
215a35c0ff Joyent now requires a keyname to be set 2015-02-19 14:52:08 -07:00
rallytime
9322d3b307 Update Arch installation docs to reference salt-zmq and salt-raet pkgs 2015-02-18 16:22:46 -07:00
rallytime
928bb30a6b Add 2014.7.2 package links to the windows installer docs 2015-02-18 13:55:26 -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
rallytime
4805677d0c Add dependency notice to proxmox.rst
Refs #14799
2015-02-13 09:14:41 -07:00
Seth House
37017a54be Replace doc examples for event.fire_master with event.send 2015-02-12 17:28:21 -07:00
Seth House
f0b5ddb77d Updated Reactor docs to reference state.event instead of eventlisten
Easier than downloading an external script.
2015-02-12 17:24:22 -07:00
Nicole Thomas
f82183d13d Merge pull request #19235 from terminalmage/lxc-refactor
LXC Refactor
2015-02-12 17:16:52 -07:00
Arnold Bechtoldt
cca2563fdf set appropriate headline for release notes of 2015.2.0 2015-02-12 23:33:37 +01:00
Seth House
3e6e6f367b Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-02-12 14:53:13 -07:00
jfindlay
b898539e49 Merge pull request #20641 from whiteinge/doc-events
Updated the event docs with the current Python API and more examples
2015-02-12 12:53:01 -07:00
Colton Myers
b2a80b195e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-12 11:44:57 -07:00
Seth House
7de5f9db8d Updated the event docs with the current Python API and more examples 2015-02-12 11:36:12 -07:00
rallytime
3f9af9f7d3 Change the release notes title to 2014.7.2 2015-02-12 11:26:17 -07:00
Erik Johnson
89a58ac4c2 Update the LXC tutorial
This updates the tutoral to reflect the new profile merging behavior.
2015-02-10 15:06:47 -06:00
Erik Johnson
1530470339 No need to mention that Debian Jessie hasn't been released 2015-02-10 15:06:46 -06:00
Erik Johnson
93835d3f4e Hide set_pass from lxc state docs 2015-02-10 15:06:46 -06:00
Erik Johnson
10238f8be7 Add warnings about creating containers from rootfs image 2015-02-10 15:06:46 -06:00
Erik Johnson
1ea87ccaa9 Formatting tweak (for consistency) 2015-02-10 15:06:46 -06:00
Erik Johnson
a8fe526d20 Replace references to "next feature release" with 2015.2.0 2015-02-10 15:06:46 -06:00
Erik Johnson
832df20df2 Complete initial draft of LXC tutorial
This will need to be filled out, but this is a good starting point.
2015-02-10 15:06:45 -06:00
Erik Johnson
c4fc5f5fa4 More info for LXC tutorial 2015-02-10 15:06:45 -06:00
Erik Johnson
2dad71adc9 Add more info to LXC tutorial 2015-02-10 15:06:45 -06:00
Erik Johnson
728488e90b Tweak section header 2015-02-10 15:06:43 -06:00
Erik Johnson
196a7d6327 Stub for LXC tutorial 2015-02-10 15:06:43 -06:00
Colton Myers
eba17606b4 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-02-09 15:37:25 -07:00
Erik Johnson
3e321fdb48 Add file-locking bugfix to 2014.7.2 release notes 2015-02-09 11:32:20 -06:00
Seth House
9a1a2db3aa Merge remote-tracking branch 'upstream/2014.7' into 2015.2 2015-02-06 19:52:23 -07:00
Seth House
bf6dfe823e Remove Mako from mocked deps for docs build
If Mako was mocked for a reason originally, it doesn't seem to be needed
anymore. The docs build just fine with and without Mako installed.

Closes #9571 (at long last).
2015-02-06 19:00:35 -07:00
Colton Myers
56520f4ac9 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	conf/minion
	salt/modules/cron.py
	salt/modules/pip.py
	salt/modules/tls.py
2015-02-06 13:00:14 -07:00
Seth House
15936658ba Added cross-references to other ways to preseed minion keys 2015-02-05 19:15:46 -07:00
Justin Findlay
a44368001b fix pip venv regression, deprecate activate param
Fixes #20191.  If `bin_env` points to a virtualenv, there is no need to
activate that virtualenv for pip to install into the virtualenv.  Also
update associated unit test.
2015-02-05 12:36:42 -07:00
Justin Findlay
b87615e277 document lowercase removal change 2015-02-03 16:27:41 -07:00
Colton Myers
ca6ecc0f0f Add only_upgrade to 2015.2 release notes 2015-01-30 16:07:39 -07:00
rallytime
c65d9673a7 Merge branch '2014.7' into merge_forward_fifteen_second_try
Conflicts:
	salt/states/file.py
2015-01-29 13:42:49 -07:00
Joseph Hall
f5e8b4a10e Don't default CA bundle updates to a non-standard location 2015-01-28 20:09:13 -07:00
Thomas S Hatch
97285aadd0 Merge pull request #20152 from techhat/httpupdate
Add function to update CA cert bundle
2015-01-28 15:03:55 -07:00
Joseph Hall
f846925ba7 Document text_out and headers_out 2015-01-28 11:08:31 -07:00
Joseph Hall
d1746fa7fe Document updating CA bundles 2015-01-28 10:51:04 -07:00
Seth House
e3d29bf8ff Fixed syntax error in log_granular_levels example 2015-01-27 20:14:53 -07:00
rallytime
dc23823897 Merge branch '2014.7' into '2015.2'
Conflicts:
	salt/modules/localemod.py
2015-01-27 13:24:14 -07:00
rallytime
80bfa4a2a6 Add beacons section to 2015.2.0 release notes 2015-01-26 20:26:51 -07:00
Seth House
8e476bc455 Fixed typos in the beacon docs 2015-01-26 18:20:54 -07:00
Seth House
b777d3cba1 Added unique identifier for the beacon docs 2015-01-26 18:19:34 -07:00
Seth House
a26aef0d7d Added beacon module docs to the module index 2015-01-26 18:19:34 -07:00
Seth House
127ddb6d9c Added cross-references to the inotify beacon module 2015-01-26 18:19:34 -07:00
Thomas S Hatch
5affea1022 Merge branch '2015.2' into beacons 2015-01-26 16:57:43 -07:00
Shane D Lee
7c253f5ede Changed exe's to installers 2015-01-26 15:48:03 -07:00
Thomas S Hatch
828906d62d Merge branch '2015.2' into beacons 2015-01-25 09:26:43 -07:00
Thomas S Hatch
54529a9aa2 Add initial documentation 2015-01-23 23:11:34 -07:00
Pedro Algarvio
cdbbe4c0dd Fix typos 2015-01-24 03:16:52 +00:00
Mike Place
b8e9249c80 Added docs for Lithium deprecations 2015-01-24 03:16:49 +00:00
Colton Myers
9e9a2eab90 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/fileserver/gitfs.py
	salt/loader.py
2015-01-23 16:13:30 -07:00
Thomas S Hatch
55cb7fdab1 Merge pull request #20015 from basepi/grainsprecedencedocs19611
Fix grains precedence issues
2015-01-23 15:40:32 -07:00
Colton Myers
f609366dee Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	doc/conf.py
2015-01-22 16:53:22 -07:00
Colton Myers
f1e7661973 Release 2014.7.1 (docs sidebar and release date for release notes) 2015-01-22 16:52:21 -07:00
Colton Myers
079e20a536 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2 2015-01-22 16:48:27 -07:00
Colton Myers
63195007d6 Merge pull request #19980 from rallytime/update_windows_release_docs
Add 2014.7.1 release to Windows Installation Docs
2015-01-22 16:48:15 -07:00
Colton Myers
c1e630340e Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/fileserver/gitfs.py
	salt/grains/core.py
2015-01-22 16:46:32 -07:00
robert.fach
4f7b0a29d1 updated information regarding required version for dulwich gitfs backend 2015-01-22 17:14:27 +01:00
Colton Myers
a067e6ceba Fix the grains precedence documentation
Fixes #19611
2015-01-21 16:10:18 -07:00
Colton Myers
098c39596a Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/templates/rh_ip/rh5_eth.jinja
	salt/templates/rh_ip/rh6_eth.jinja
	salt/utils/templates.py
2015-01-21 11:19:06 -07:00
Thomas S Hatch
678c57f414 Merge pull request #19907 from techhat/httpdocs
Update HTTP tutorial for new functionality
2015-01-21 10:41:34 -07:00
Joseph Hall
483e84c78a Update HTTP tutorial for new functionality 2015-01-21 09:20:11 -07:00
Joseph Hall
667473c72c Modify how joyent driver handles SSL and URLs 2015-01-21 08:29:06 -07:00
Thomas S Hatch
602b1a34aa Merge pull request #19862 from kev009/freebsd-kmods
Add freebsdkmod changes to 2014.7.2 relnotes
2015-01-20 16:06:17 -07:00
Colton Myers
88fb2e0036 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	doc/topics/tutorials/starting_states.rst
	salt/modules/linux_lvm.py
2015-01-20 15:19:53 -07:00
Colton Myers
1fb6fc0ba1 Fix the explanation of the Default Data - YAML section of starting states 2015-01-20 15:03:54 -07:00
rallytime
99e35ffb1e Add 2014.7.1 release to Windows Installation Docs
Also remove the links to the 2014.7.0 exe's because of regressions.
2015-01-20 12:21:57 -07:00
Kevin Bowling
494543c5bc Add freebsdkmod changes to 2014.7.2 relnotes 2015-01-20 02:09:32 -07:00
Colton Myers
d1b201e2bf Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	salt/runners/manage.py
	salt/utils/cloud.py
2015-01-15 16:20:48 -07:00
Joseph Hall
56a52f9552 Merge pull request #19752 from rallytime/remove_sshpass_checks
Remove sshpass checks
2015-01-15 15:12:00 -07:00
rallytime
4d5cc90c6a Remove sshpass checks from utils/cloud.py and other references
Fixes #19219
2015-01-14 23:08:00 -07:00
Colton Myers
228ada2890 Add release notes for 2014.7.2 2015-01-14 15:17:33 -07:00
Colton Myers
2e364ac249 Add more release notes for 2014.7.1 2015-01-14 15:17:21 -07:00
Erik Johnson
175ba127be Merge branch '2014.7' into 2014.7-2015.2
Conflicts:
	salt/modules/archive.py
2015-01-14 14:26:22 -06:00
rallytime
4a1a5123f2 Remove old --out options from salt-cloud docs
Fixes #19453
2015-01-13 21:39:27 -07:00
Colton Myers
2a6c9a8165 Merge remote-tracking branch 'upstream/2014.7' into merge-forward-2015.2
Conflicts:
	doc/topics/ssh/index.rst
2015-01-13 11:58:58 -07:00
David\ Beitey
839968f637 Expand documentation about Saltfile for salt-ssh 2015-01-13 16:50:29 +10:00
Colton Myers
3ce5eb2838 Merge branch '2014.7' into merge-forward-2015.2
Conflicts:
	salt/modules/archive.py
	salt/modules/brew.py
	salt/modules/pip.py
	tests/unit/modules/archive_test.py
	tests/unit/modules/pip_test.py
2015-01-09 11:39:09 -07:00
Mike Place
b419366443 Release note note
Fixes #18551
2015-01-08 16:41:20 -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
Colton Myers
cc74c400b9 Add docs for mine in salt-ssh 2014-12-23 12:14:31 -07:00
Colton Myers
139bd8df5b Add salt-ssh mine to lithium release notes 2014-12-23 11:35:40 -07:00
Colton Myers
321413e638 Rename lithium release notes to 2015.2.0 2014-12-23 11:34:52 -07:00
Colton Myers
dc778a8e5e Merge branch '2014.7' into develop
Conflicts:
	salt/client/ssh/__init__.py
	salt/states/boto_secgroup.py
2014-12-23 10:57:26 -07:00
Colton Myers
f2fd892dc5 Merge pull request #19145 from whiteinge/sphinx-fixups
Minor Sphinx fixups
2014-12-22 16:25:01 -07:00
Colton Myers
7fc1cc2ba2 Merge branch '2014.7' into merge-forward
Conflicts:
	doc/topics/releases/2014.7.1.rst
	salt/modules/mdadm.py
	salt/modules/mine.py
	salt/modules/win_firewall.py
	salt/modules/win_groupadd.py
	salt/modules/win_service.py
	salt/modules/win_system.py
	salt/modules/win_useradd.py
	salt/runners/jobs.py
	tests/unit/modules/mdadm_test.py
2014-12-22 13:33:53 -07:00
rallytime
b43519b882 Update the windows package to correct one: 2014.7.0 --> 2014.7.0-1
Fixes #19146
2014-12-19 16:00:30 -07:00
Seth House
a8e8111c92 Add a cross-ref to the vmbuilder formula repo 2014-12-19 14:34:58 -07:00
Seth House
d2e9378084 Switch html_title to empty string instead of None 2014-12-19 14:34:58 -07:00
Seth House
a33ae0655f Switch the :formula: extlink to :formula_url:
The addition of the Salt domain conflicted with this role. Better to
rename this one to be more explicit and to save that real-estate for
future use.
2014-12-19 14:34:57 -07:00
Seth House
f345188d06 Set minimum Sphinx version to 1.3 2014-12-19 14:34:57 -07:00
Colton Myers
9d5e05a381 Add more release notes for 2014.7.1 2014-12-18 14:19:52 -07:00
Thomas S Hatch
1dcc05b049 Merge branch '2014.7' into develop
Conflicts:
	salt/modules/yumpkg.py
2014-12-17 15:00:26 -07:00
Thomas S Hatch
45365c095e Merge pull request #19029 from basepi/merge-forward
Merge forward from 2014.7 to develop
2014-12-17 14:48:01 -07:00
Joseph Hall
bc58c569ab Update docs for impacket dep 2014-12-17 11:45:49 -07:00
rallytime
926c486587 Correct master_sign_key_name reference
Fixes #19053
2014-12-17 11:32:23 -07:00
Colton Myers
e0b6f1623c Add publish wrapper to lithium release notes 2014-12-16 16:13:03 -07:00
Colton Myers
fc16bd16c0 Merge branch '2014.7' into merge-forward
Conflicts:
	doc/faq.rst
	doc/ref/states/compiler_ordering.rst
	doc/topics/best_practices.rst
	doc/topics/development/conventions/formulas.rst
	salt/config.py
	salt/modules/state.py
	salt/states/mount.py
	salt/utils/event.py
	tests/unit/utils/process_test.py
2014-12-16 14:45:25 -07:00
Seth House
51fa87c446 Change all state examples to use short-dec format for consistency
Closes #12419.

The command used to search the docs for state examples is below. This
generates a file in Vim's quickfix format that can be loaded with the -q
flag.

find . -type f \( -name '*.rst' -o -name '*.py' \) -print0
    | xargs -0 -P10 -n1 awk '
        BEGIN { RS=""; FS="\n" }
        { linenr = linect; linect += (NF + 1) }
        /^\s+[a-zA-Z0-9'\''_-]+:\n\s+[a-zA-Z0-9'\''_-]+:\n\s+- / {
            print FILENAME "|" linenr + 2 "|", $1
        }
    ' > ./salt-states.quickfix
2014-12-12 23:36:40 -07:00
Seth House
c0567bab0f Updated Formula Best Practices doc with several recommendations 2014-12-12 17:43:00 -07:00
Seth House
d0f038eec0 Minor clarification to not pointing directly to formulas repos 2014-12-12 17:42:54 -07:00
Seth House
e7922758ae Minor rST formatting 2014-12-12 17:42:53 -07:00
Thomas Jackson
4d41fa35a1 Comma cleanup 2014-12-12 11:40:36 -08:00
Thomas Jackson
2bd05998b3 Comma cleanup 2014-12-12 11:40:10 -08:00
Thomas Jackson
2fa6dad350 Comma cleanup 2014-12-12 11:39:55 -08:00
Thomas Jackson
fb7e5630d8 Comma cleanup 2014-12-12 11:39:40 -08:00
Thomas Jackson
f0aae727ce Comma cleanup 2014-12-12 11:39:07 -08:00
Thomas Jackson
d5d0a35297 Comma cleanup 2014-12-12 11:38:50 -08:00
Thomas Jackson
57933e9148 Comma cleanup 2014-12-12 11:38:18 -08:00
Thomas Jackson
85864eca4a Comma cleanup 2014-12-12 11:37:59 -08:00
Thomas Jackson
7da2bbc457 fix usage of e.g (no comma) 2014-12-12 11:37:48 -08:00
Thomas Jackson
8df54973c3 Comma cleanup 2014-12-12 11:34:51 -08:00
Thomas Jackson
da3ea213e9 Comma cleanup 2014-12-12 11:34:34 -08:00
Thomas Jackson
23674c100d Comma cleanup 2014-12-12 11:33:14 -08:00
Thomas Jackson
c1860f3dd9 Comma cleanup 2014-12-12 11:32:58 -08:00
Thomas Jackson
8b635fe07d Comma Cleanup 2014-12-12 11:32:16 -08:00
Thomas Jackson
3f4b2cc8bb Comma cleanup 2014-12-12 11:31:43 -08:00
Thomas S Hatch
e094b0136f Merge pull request #18902 from jacksontj/develop
More grammar/style cleanup
2014-12-12 09:40:55 -07:00
Joseph Hall
7099c02a53 Add serial commas to the style guide 2014-12-12 03:30:11 -07:00
Steve Groesz
e66a02b18b Update netapi reference
Resolves issue #18760
2014-12-11 18:14:47 -06:00
Thomas S Hatch
16b4c9eb74 Merge pull request #18904 from MrCitron/feature-18866
Feature 18866
2014-12-11 17:04:39 -07:00
Steve Groesz
6cb313533b Fix missing text
Found missing colon, causing code blocks not to display.  This fixes issue #18879
2014-12-11 17:29:31 -06:00
Metin OSMAN
d0799a864c Update documentation 2014-12-11 22:25:29 +01:00
Metin OSMAN
0e8d617523 Merge branch 'develop' of https://github.com/saltstack/salt into feature-18866 2014-12-11 21:35:05 +01:00
Thomas Jackson
f268bb8b4b Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
68c0dc0717 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
9523435ee4 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
4df8db515c Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
e32a7e1ed7 Whitespace cleanup 2014-12-11 07:53:20 -08:00
Thomas Jackson
9db7f8f7e9 Whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
2afd4c8c04 Whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
d12677156e Whitespace cleanup 2014-12-11 07:53:19 -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
Thomas Jackson
0f4a23b93a Trailing whitespace cleanup 2014-12-11 07:53:19 -08:00
Thomas Jackson
c18e834be1 Fix trailing whitespace
Conflicts:
	doc/topics/tutorials/states_pt2.rst
2014-12-11 07:53:19 -08:00
Thomas Jackson
52fe04db18 Remove trailing whitespace 2014-12-11 07:53:19 -08:00
Thomas Jackson
3859204103 Fix typo in renderers doc, the directory name was wrong 2014-12-10 18:42:16 -08:00
Metin OSMAN
21a6f6f0e7 Add the ability to filter the map file with salt-cloud 2014-12-11 01:39:54 +01:00
Thomas S Hatch
bcb529f809 Merge pull request #18823 from scalp42/typos
Correct some typos
2014-12-09 14:43:15 -07:00
Pedro Algarvio
e5dc9f5b28 Merge pull request #18849 from techhat/ec2win
Copy fixes for Windows Salt Cloud doc
2014-12-09 19:03:20 +00:00
Joseph Hall
25d8cb6560 Copy fixes for Windows Salt Cloud doc 2014-12-09 11:57:35 -07:00
Thomas S Hatch
3d73816507 Merge branch '2014.7' into develop
Conflicts:
	salt/modules/virtualenv_mod.py
	salt/states/network.py
	salt/utils/parsers.py
2014-12-09 10:59:18 -07:00
Anthony Scalisi
44963fae0e fix various typos 2014-12-08 14:32:53 -08:00
Thomas S Hatch
ac08c08695 Merge pull request #18815 from techhat/ec2win
Allow userdata to be passed to EC2
2014-12-08 15:07:38 -07:00
Joseph Hall
790cd28ff1 Update Windows docs for auto-generated Windows passwords 2014-12-08 14:23:05 -07:00
Thomas S Hatch
7dd99fbd91 Merge pull request #18794 from nmadhok/doc-fixes
Doc fixes
2014-12-08 13:22:39 -07:00