From 3acd799991b6c10e15f2ea32b80ad2335f62270a Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 29 Apr 2016 15:42:47 -0400 Subject: [PATCH] Install redhat-lsb-core prior to test. --- tasks/main.yml | 5 +---- tests/Dockerfile.centos-6 | 2 ++ tests/Dockerfile.centos-7 | 2 ++ 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index f99dd38..ee2aa4f 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,12 +1,9 @@ --- +# Variable configuration. - name: Include OS-specific variables. include_vars: "{{ ansible_os_family }}.yml" 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). include_vars: "{{ ansible_os_family }}-{{ ansible_lsb.major_release }}.yml" when: ansible_os_family == "RedHat" diff --git a/tests/Dockerfile.centos-6 b/tests/Dockerfile.centos-6 index 4a4e7b8..27ff215 100644 --- a/tests/Dockerfile.centos-6 +++ b/tests/Dockerfile.centos-6 @@ -1,5 +1,7 @@ FROM centos:6 +RUN yum -y install redhat-lsb-core + # Install Ansible RUN yum -y update; yum clean all; RUN yum -y install epel-release diff --git a/tests/Dockerfile.centos-7 b/tests/Dockerfile.centos-7 index 8aa0654..fb37a6f 100644 --- a/tests/Dockerfile.centos-7 +++ b/tests/Dockerfile.centos-7 @@ -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/anaconda.target.wants/*; +RUN yum -y install redhat-lsb-core + # Install Ansible RUN yum -y install epel-release RUN yum -y install git ansible sudo