From 936927a54fa79b58e8679e887c813ea32944d906 Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Sun, 10 Apr 2016 22:08:13 +0200
Subject: [PATCH] Fix docker install on rhel7
---
roles/docker/files/rh_docker.repo | 6 ++++++
roles/docker/tasks/main.yml | 9 ++++++++-
roles/docker/vars/redhat.yml | 2 +-
roles/kubernetes/preinstall/tasks/main.yml | 8 ++------
4 files changed, 17 insertions(+), 8 deletions(-)
create mode 100644 roles/docker/files/rh_docker.repo
diff --git a/roles/docker/files/rh_docker.repo b/roles/docker/files/rh_docker.repo
new file mode 100644
index 000000000..a66294c93
--- /dev/null
+++ b/roles/docker/files/rh_docker.repo
@@ -0,0 +1,6 @@
+[dockerrepo]
+name=Docker Repository
+baseurl=https://yum.dockerproject.org/repo/main/centos/7
+enabled=1
+gpgcheck=1
+gpgkey=https://yum.dockerproject.org/gpg
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index b47c9d302..3b39bd850 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -38,6 +38,13 @@
with_items: "{{ docker_repo_info.repos }}"
when: docker_repo_info.repos|length > 0
+- name: Configure docker repository on RedHat
+ copy:
+ src: "rh_docker.repo"
+ dest: "/etc/yum.repos.d/docker.repo"
+ when: ansible_distribution == "RedHat" and
+ ansible_distribution_major_version > 7
+
- name: ensure docker packages are installed
action: "{{ docker_package_info.pkg_mgr }}"
args:
@@ -53,7 +60,7 @@
regexp: '^DOCKER_STORAGE_OPTIONS=.*$'
state: present
backup: yes
- when: ansible_os_family == "RedHat"
+ when: ansible_distribution == "CentOS"
- meta: flush_handlers
diff --git a/roles/docker/vars/redhat.yml b/roles/docker/vars/redhat.yml
index 24018dedf..9814089e0 100644
--- a/roles/docker/vars/redhat.yml
+++ b/roles/docker/vars/redhat.yml
@@ -3,7 +3,7 @@ docker_kernel_min_version: '0'
docker_package_info:
pkg_mgr: yum
pkgs:
- - docker
+ - docker-engine
docker_repo_key_info:
pkg_key: ''
diff --git a/roles/kubernetes/preinstall/tasks/main.yml b/roles/kubernetes/preinstall/tasks/main.yml
index d90570ca5..29fa2f1ab 100644
--- a/roles/kubernetes/preinstall/tasks/main.yml
+++ b/roles/kubernetes/preinstall/tasks/main.yml
@@ -78,16 +78,12 @@
ansible_distribution_major_version > 21
changed_when: False
-- name: Install epel-release on RHEL
- command: rpm -ivh http://dl.fedoraproject.org/pub/epel/7/x86_64/e/epel-release-7-5.noarch.rpm
- when: ansible_distribution == "RedHat"
-
-- name: Install epel-release on CentOS
+- name: Install epel-release on RedHat/CentOS
action:
module: "{{ ansible_pkg_mgr }}"
name: "epel-release"
state: latest
- when: ansible_distribution == "CentOS"
+ when: ansible_distribution in ['CentOS', 'RedHat']
- name: Install packages requirements
action:
--
GitLab