Install redhat-lsb-core prior to test.

This commit is contained in:
Jeff Geerling
2016-04-29 15:42:47 -04:00
parent 91c3b9c3eb
commit 3acd799991
3 changed files with 5 additions and 4 deletions

View File

@@ -1,12 +1,9 @@
--- ---
# Variable configuration.
- name: Include OS-specific variables. - name: Include OS-specific variables.
include_vars: "{{ ansible_os_family }}.yml" include_vars: "{{ ansible_os_family }}.yml"
when: ansible_os_family != "RedHat" when: ansible_os_family != "RedHat"
- name: Ensure required dependency is installed (RedHat).
yum: name=redhat-lsb-core state=installed
when: ansible_os_family == "RedHat"
- name: Include OS-specific variables (RedHat). - name: Include OS-specific variables (RedHat).
include_vars: "{{ ansible_os_family }}-{{ ansible_lsb.major_release }}.yml" include_vars: "{{ ansible_os_family }}-{{ ansible_lsb.major_release }}.yml"
when: ansible_os_family == "RedHat" when: ansible_os_family == "RedHat"

View File

@@ -1,5 +1,7 @@
FROM centos:6 FROM centos:6
RUN yum -y install redhat-lsb-core
# Install Ansible # Install Ansible
RUN yum -y update; yum clean all; RUN yum -y update; yum clean all;
RUN yum -y install epel-release RUN yum -y install epel-release

View File

@@ -12,6 +12,8 @@ rm -f /lib/systemd/system/sockets.target.wants/*initctl*; \
rm -f /lib/systemd/system/basic.target.wants/*; \ rm -f /lib/systemd/system/basic.target.wants/*; \
rm -f /lib/systemd/system/anaconda.target.wants/*; rm -f /lib/systemd/system/anaconda.target.wants/*;
RUN yum -y install redhat-lsb-core
# Install Ansible # Install Ansible
RUN yum -y install epel-release RUN yum -y install epel-release
RUN yum -y install git ansible sudo RUN yum -y install git ansible sudo