redhat: Add the EPEL repository for aria2 and python2-lxc packages

The ARIA2 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. This also removes the 'debootstrap' package from
CentOS since it's not needed. Finally, we include the nodepool playbook
from the tests repository in order to populate the necessary CI facts.

Depends-On: https://review.openstack.org/#/c/574801/
Depends-On: https://review.openstack.org/#/c/575059/
Change-Id: Icd4d09a26cd95ecfefec26142723ddffe81aae74
Co-Authored-By: Markos Chandras <mchandras@suse.de>
This commit is contained in:
Mohammed Naser 2018-06-11 14:37:20 -04:00 committed by Markos Chandras
parent e073fee153
commit 1d7fe1e10c
3 changed files with 24 additions and 7 deletions

View File

@ -75,6 +75,29 @@
- "rsync -a --delete /tmp/thm-lxc2.0/ /opt/thm-lxc2.0/" - "rsync -a --delete /tmp/thm-lxc2.0/ /opt/thm-lxc2.0/"
- "yum-config-manager --enable thm-lxc2.0-local" - "yum-config-manager --enable thm-lxc2.0-local"
- name: Install EPEL gpg keys
rpm_key:
key: "http://dl.fedoraproject.org/pub/epel/RPM-GPG-KEY-EPEL-7"
state: present
register: _add_yum_keys
until: _add_yum_keys | success
retries: 5
delay: 2
- name: Install the EPEL repository
yum_repository:
name: epel-lxc_hosts
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: 'aria2 python2-lxc'
register: install_epel_repo
until: install_epel_repo|success
retries: 5
delay: 2
- name: Install distro packages - name: Install distro packages
package: package:
pkg: "{{ lxc_hosts_distro_packages }}" pkg: "{{ lxc_hosts_distro_packages }}"

View File

@ -44,12 +44,7 @@
set_fact: set_fact:
lxc_container_ssh_key: "{{ _root_ssh_key['content'] | b64decode }}" lxc_container_ssh_key: "{{ _root_ssh_key['content'] | b64decode }}"
# This is a temporary hack to override the LXC image source to - include_tasks: "common/common-tasks/test-set-nodepool-vars.yml"
# the reverse proxy if the test is run in OpenStack-Infra.
- name: Check if this is an OpenStack-CI nodepool instance
stat:
path: /etc/nodepool/provider
register: nodepool
roles: roles:
- role: "lxc_hosts" - role: "lxc_hosts"

View File

@ -22,7 +22,6 @@ lxc_hosts_distro_packages:
- bridge-utils - bridge-utils
- btrfs-progs - btrfs-progs
- dbus - dbus
- debootstrap
- dnsmasq - dnsmasq
- git - git
- libseccomp - libseccomp