From 67cedb7ad569b19138f52fdfd353d4600bc4b2bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rados=C5=82aw=20Piliszek?= Date: Thu, 1 Aug 2019 21:11:10 +0200 Subject: [PATCH] Do not require EPEL repo on RHEL-based target hosts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This change makes kolla-ansible more compatible with RHEL which does not provide epel-release package. EPEL was required to install simplejson from rpm which was an ansible requirement when used python version was below 2.5 ([1]). This has been obsolete for quite a time so it's a good idea to get rid of it. This change includes update of docs to read more properly. [1] https://docs.ansible.com/ansible/2.3/intro_installation.html Change-Id: I825431d41fbceb824baff27130d64dabe4475d33 Signed-off-by: Radosław Piliszek --- ansible/roles/baremetal/defaults/main.yml | 1 - ansible/roles/baremetal/tasks/pre-install.yml | 4 ++-- doc/source/user/quickstart.rst | 22 +++++++------------ .../notes/drop-epel-req-2f48edf20da1ef96.yaml | 5 +++++ 4 files changed, 15 insertions(+), 17 deletions(-) create mode 100644 releasenotes/notes/drop-epel-req-2f48edf20da1ef96.yaml diff --git a/ansible/roles/baremetal/defaults/main.yml b/ansible/roles/baremetal/defaults/main.yml index 4904b33caa..0b51878d08 100644 --- a/ansible/roles/baremetal/defaults/main.yml +++ b/ansible/roles/baremetal/defaults/main.yml @@ -87,7 +87,6 @@ debian_pkg_install: - "{% if enable_ceph_nfs|bool %}rpcbind{% endif %}" redhat_pkg_install: - - epel-release - "{{ docker_yum_package }}" - git - python-setuptools diff --git a/ansible/roles/baremetal/tasks/pre-install.yml b/ansible/roles/baremetal/tasks/pre-install.yml index d24f1e01a4..f29b62ea22 100644 --- a/ansible/roles/baremetal/tasks/pre-install.yml +++ b/ansible/roles/baremetal/tasks/pre-install.yml @@ -1,8 +1,8 @@ --- # NOTE: raw install is required to support cloud images which do not have python installed -- name: "Install python2 and python-simplejson" +- name: "Install python2" become: True - raw: "yum install -y python python-simplejson || (apt-get update && apt-get install -y python2.7 python-simplejson)" + raw: "yum install -y python || (apt-get update && apt-get install -y python2.7)" - name: Gather facts setup: diff --git a/doc/source/user/quickstart.rst b/doc/source/user/quickstart.rst index d98ed7247c..e31e342d03 100644 --- a/doc/source/user/quickstart.rst +++ b/doc/source/user/quickstart.rst @@ -34,12 +34,6 @@ Note that this is independent from the use of a virtual environment for remote execution, which is described in :kolla-ansible-doc:`Virtual Environments `. -#. For CentOS, install EPEL. - - .. code-block:: console - - sudo yum install epel-release - #. For Ubuntu, update the package index. .. code-block:: console @@ -48,7 +42,7 @@ execution, which is described in #. Install Python build dependencies: - For CentOS, run: + For CentOS or RHEL, run: .. code-block:: console @@ -113,7 +107,7 @@ If installing Kolla Ansible in a virtual environment, skip this section. .. code-block:: console - sudo yum install python-pip + sudo easy_install pip For Ubuntu, run: @@ -177,7 +171,7 @@ Install Kolla-ansible for deployment or evaluation cp -r /path/to/virtualenv/share/kolla-ansible/etc_examples/kolla/* /etc/kolla - If not using a virtual environment on CentOS, run: + If not using a virtual environment on CentOS or RHEL, run: .. code-block:: console @@ -198,7 +192,7 @@ Install Kolla-ansible for deployment or evaluation cp /path/to/virtualenv/share/kolla-ansible/ansible/inventory/* . - If not using a virtual environment on CentOS, run: + If not using a virtual environment on CentOS or RHEL, run: .. code-block:: console @@ -372,13 +366,13 @@ There are a few options that are required to deploy Kolla-Ansible: Kolla provides choice of several Linux distributions in containers: - - Centos + - CentOS - Ubuntu - - Oraclelinux + - Oracle Linux - Debian - RHEL - For newcomers, we recommend to use CentOS 7 or Ubuntu 16.04. + For newcomers, we recommend to use CentOS 7 or Ubuntu 18.04. .. code-block:: console @@ -569,7 +563,7 @@ Using OpenStack create example networks, images, and so on. * For deployment or evaluation, - run ``init-runonce`` script on CentOS: + run ``init-runonce`` script on CentOS or RHEL: .. code-block:: console diff --git a/releasenotes/notes/drop-epel-req-2f48edf20da1ef96.yaml b/releasenotes/notes/drop-epel-req-2f48edf20da1ef96.yaml new file mode 100644 index 0000000000..33706dfb2b --- /dev/null +++ b/releasenotes/notes/drop-epel-req-2f48edf20da1ef96.yaml @@ -0,0 +1,5 @@ +--- +upgrade: + - | + RHEL-based targets no longer require EPEL repository. It can be safely + removed from target hosts if not used otherwise.