External-Mirrors/kubespray
2
0
Fork 0
mirror of https://github.com/kubernetes-sigs/kubespray.git synced 2026-02-13 17:24:51 -03:30
Code Issues Packages Projects Releases Wiki Activity

Fix epel_enabled and RHEL support in bootstrap-os

Browse Source 
Looks like `epel_enabled` was not configured for the epel install in `bootstrap-centos.yml`. Also, there were no conditionals that would trigger bootstrap for RHEL.
This commit is contained in:
Chad Swenson
2019-01-22 15:44:11 -06:00
parent e6f1c4df7f
commit 881be9b741
5 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
roles/container-engine/docker/templates/docker.service.j2
View File

@@ -2,13 +2,13 @@
Description=Docker Application Container Engine
Documentation=http://docs.docker.com
{% if ansible_os_family == "RedHat" %}
After=network.target docker-storage-setup.service{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
After=network.target docker-storage-setup.service{{ ' containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') else '' }}
Wants=docker-storage-setup.service
{% elif ansible_os_family == "Debian" %}
After=network.target docker.socket{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
After=network.target docker.socket{{ ' containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') else '' }}
Wants=docker.socket
{% elif ansible_os_family == "Suse" %}
After=network.target{% if installed_docker_version.stdout is version('18.09.1', '>=') %} containerd.service{% endif %}
After=network.target{{ ' containerd.service' if installed_docker_version.stdout is version('18.09.1', '>=') else '' }}
{% endif %}
[Service]