From 71d6a0b328f5478cbe8f18f1c2ef61ce20a9a922 Mon Sep 17 00:00:00 2001 From: Jeff Geerling Date: Fri, 29 Apr 2016 14:41:29 -0400 Subject: [PATCH] Fix test build for CentOS 7. --- tasks/main.yml | 2 +- tests/Dockerfile.centos-7 | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/tasks/main.yml b/tasks/main.yml index 3068053..7e6a137 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -6,7 +6,7 @@ # Include version-specific variables for RedHat. - name: Include OS-specific variables (RedHat). - include_vars: "{{ ansible_os_family }}-{{ ansible_distribution_version|slice(1) }}.yml" + include_vars: "{{ ansible_os_family }}-{{ ansible_lsb.major_release }}.yml" when: ansible_os_family == "RedHat" - name: Define mysql_packages. 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