valitydev/salt
14
0
Fork 0
mirror of https://github.com/valitydev/salt.git synced 2024-11-08 09:23:56 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #10975 from terminalmage/10930

Browse Source 
Add information on yum-utils requirement for yum pkg mgmt
This commit is contained in:
Joseph Hall 2014-03-05 11:27:10 -07:00
commit 93dc0efe9c
2 changed files with 53 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
doc/topics/development/hacking.rst
View File

@ -127,6 +127,8 @@ of the patch and a place for discussion.
.. _`git format-patch`: https://www.kernel.org/pub/software/scm/git/docs/git-format-patch.html
.. _installing-for-development:
Installing Salt for development
-------------------------------
@ -230,6 +232,12 @@ Install Salt (and dependencies) into the virtualenv:
You can install needed dependencies on OS X using homebrew or macports.
See :doc:`OS X Installation </topics/installation/osx>`
.. warning:: Installing on RedHat-based Distros
If installing from pip (or from source using ``setup.py install``), be
advised that the ``yum-utils`` package is needed for Salt to manage
packages on RedHat-based systems.
Running a self-contained development version
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~

62
doc/topics/installation/rhel.rst
View File

@ -2,21 +2,37 @@
RHEL / CentOS / Scientific Linux / Amazon Linux / Oracle Linux
==========================================================================
Beginning with version 0.9.4, Salt has been available in `EPEL`_. It is installable using yum. Salt should work properly with all mainstream derivatives
of RHEL, including CentOS, Scientific Linux, Oracle Linux and Amazon Linux. Report any bugs or issues to the salt GitHub project.
Installation Using pip
======================
Installation
============
Since Salt is on `PyPI`_, it can be installed using pip, though most users
prefer to install using RPMs (which can be installed from `EPEL`_).
Installation from pip is easy:
Salt and all dependencies have been accepted into the yum repositories for
EPEL5 and EPEL6. The latest salt version can be found in epel-testing, while an
older but more tested version can be found in regular epel.
Example showing how to install salt from epel-testing:
.. _`PyPI`: https://pypi.python.org/pypi/salt
.. code-block:: bash
yum --enablerepo=epel-testing install salt-minion
pip install salt
.. warning::
If installing from pip (or from source using ``setup.py install``), be
advised that the ``yum-utils`` package is needed for Salt to manage
packages. Also, if the Python dependencies are not already installed, then
you will need additional libraries/tools installed to build some of them.
More information on this can be found :ref:`here
<installing-for-development>`.
Installation from EPEL
======================
Beginning with version 0.9.4, Salt has been available in `EPEL`_. It is
installable using yum. Salt should work properly with all mainstream
derivatives of RHEL, including CentOS, Scientific Linux, Oracle Linux and
Amazon Linux. Report any bugs or issues on the `issue tracker`__.
.. __: https://github.com/saltstack/salt/issues
On RHEL6, the proper Jinja package 'python-jinja2' was moved from EPEL to the
"RHEL Server Optional Channel". Verify this repository is enabled before
@ -25,11 +41,8 @@ installing salt on RHEL6.
.. _`EPEL`: http://fedoraproject.org/wiki/EPEL
Salt can be installed using ``yum`` and is available in the standard Fedora
repositories.
Enabling EPEL on RHEL
=====================
---------------------
If EPEL is not enabled on your system, you can use the following commands to
enable it.
@ -47,10 +60,12 @@ For RHEL 6:
rpm -Uvh http://ftp.linux.ncsu.edu/pub/epel/6/i386/epel-release-6-8.noarch.rpm
Stable Release
--------------
Installing Stable Release
-------------------------
Salt is packaged separately for the minion and the master. It is necessary only to install the appropriate package for the role the machine will play. Typically, there will be one master and multiple minions.
Salt is packaged separately for the minion and the master. It is necessary only
to install the appropriate package for the role the machine will play.
Typically, there will be one master and multiple minions.
On the salt-master, run this:
@ -64,6 +79,19 @@ On each salt-minion, run this:
yum install salt-minion
Installing from ``epel-testing``
--------------------------------
When a new Salt release is packaged, it is first admitted into the
``epel-testing`` repository, before being moved to the stable repo.
To install from ``epel-testing``, use the ``enablerepo`` argument for yum:
.. code-block:: bash
yum --enablerepo=epel-testing install salt-minion
Post-installation tasks
=======================