diff --git a/docs/docsite/rst/intro_installation.rst b/docs/docsite/rst/intro_installation.rst index b4d596c3f97..ee875117fac 100644 --- a/docs/docsite/rst/intro_installation.rst +++ b/docs/docsite/rst/intro_installation.rst @@ -104,21 +104,23 @@ Installing the Control Machine Latest Release Via Yum ++++++++++++++++++++++ -RPMs are available from yum for `EPEL -`_ 6, 7, and currently supported +.. note:: We’ve changed how the Ansible community packages are distributed. + For users of RHEL/CentOS/Scientific Linux version 7, the Ansible community RPM + package will transition from the EPEL repository to the Extras channel. There will be no + change for version 6 of RHEL/CentOS/Scientific Linux since Extras is not a part of version 6. + +RPMs for RHEL7 are available from `the Extras channel `_. + +RPMs for RHEL6 are available from yum for `EPEL +`_ 6 and currently supported Fedora distributions. +Ansible will also have RPMs/YUM-repo available at ``_ - -.. code-block:: bash - - # install the epel-release RPM if needed on CentOS, RHEL, or Scientific Linux - $ sudo yum install ansible - -You can also build an RPM yourself. From the root of a checkout or tarball, use the ``make rpm`` command to build an RPM you can distribute and install. Make sure you have ``rpm-build``, ``make``, ``asciidoc``, ``git``, ``python-setuptools`` and ``python2-devel`` installed. +You can also build an RPM yourself. From the root of a checkout or tarball, use the ``make rpm`` command to build an RPM you can distribute and install. .. code-block:: bash @@ -262,7 +264,7 @@ Then install Ansible with [1]_:: Or if you are looking for the latest development version:: - pip install git+https://github.com/ansible/ansible.git@devel + pip install git+git://github.com/ansible/ansible.git@devel If you are installing on OS X Mavericks, you may encounter some noise from your compiler. A workaround is to do the following:: @@ -277,6 +279,9 @@ Tarballs of Tagged Releases Packaging Ansible or wanting to build a local package yourself, but don't want to do a git checkout? Tarballs of releases are available on the `Ansible downloads `_ page. +These releases are also tagged in the `git repository `_ with the release version. + + .. _from_source: Running From Source