redhat: Add the EPEL repository for moreutils packages
The moreutils package is needed from EPEL so we install it inside the role. Moreover, in order to minimize the potential EPEL vs RDO package conflicts, we only allow a small subset of packages from the EPEL repository. Finally, we include the nodepool playbook from the tests repository in order to populate the necessary CI facts. Also, we don't need the LXC development headers so drop them. Change-Id: I287a7209d7840283e374a8bb14d9caa4f714baf0
This commit is contained in:
parent
de49fe66af
commit
e916c744d5
|
@ -13,6 +13,33 @@
|
|||
# See the License for the specific language governing permissions and
|
||||
# limitations under the License.
|
||||
|
||||
- name: Install EPEL gpg keys
|
||||
rpm_key:
|
||||
key: "http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7"
|
||||
state: present
|
||||
when:
|
||||
- ansible_pkg_mgr in ['yum', 'dnf']
|
||||
register: _add_yum_keys
|
||||
until: _add_yum_keys | success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Install the EPEL repository
|
||||
yum_repository:
|
||||
name: epel-repo_build
|
||||
baseurl: "{{ (centos_epel_mirror | default ('http://download.fedoraproject.org/pub/epel')) ~ '/' ~ ansible_distribution_major_version ~ '/' ~ ansible_architecture }}"
|
||||
description: 'Extra Packages for Enterprise Linux 7 - $basearch'
|
||||
gpgcheck: yes
|
||||
enabled: yes
|
||||
state: present
|
||||
includepkgs: 'moreutils perl-Time-Duration'
|
||||
when:
|
||||
- ansible_pkg_mgr in ['yum', 'dnf']
|
||||
register: install_epel_repo
|
||||
until: install_epel_repo|success
|
||||
retries: 5
|
||||
delay: 2
|
||||
|
||||
- name: Install packages
|
||||
package:
|
||||
name: "{{ repo_build_distro_packages }}"
|
||||
|
|
|
@ -24,7 +24,6 @@ repo_build_distro_packages:
|
|||
- librados2-devel # required to build cradox
|
||||
- libvirt-devel # required to build libvirt-python
|
||||
- libxslt-devel # required to build lxml
|
||||
- lxc-devel # required to build lxc-python2
|
||||
- MariaDB-devel # required to build MySQL-python
|
||||
- moreutils # provides `ts` command to timestamp pip logs
|
||||
- openldap-devel # required to build python-ldap
|
||||
|
|
|
@ -26,7 +26,6 @@ repo_build_distro_packages:
|
|||
- libvirt-devel # required to build libvirt-python
|
||||
- libxslt1
|
||||
- libxslt-devel # required to build lxml
|
||||
- lxc-devel # required to build lxc-python2
|
||||
- MariaDB-devel # required to build MySQL-python
|
||||
- moreutils # provides `ts` command to timestamp pip logs
|
||||
- cyrus-sasl-devel # required to build python-ldap
|
||||
|
|
|
@ -35,7 +35,6 @@ repo_build_distro_packages:
|
|||
- libvirt-dev # required to build libvirt-python
|
||||
- libxslt1-dev # required to build lxml
|
||||
- libxml2-dev # required to build lxml
|
||||
- lxc-dev # required to build lxc-python2
|
||||
- moreutils # provides `ts` command to timestamp pip logs
|
||||
- pkg-config
|
||||
- python-dev
|
||||
|
|
Loading…
Reference in New Issue