Merge pull request #4088 from chadswen/bootstrap-rhel-epel-fixes

Fix epel_enabled and RHEL support in bootstrap-os
This commit is contained in:
Chad Swenson 2019-01-22 17:13:10 -06:00 committed by GitHub
commit 5708914699
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 11 additions and 4 deletions

View file

@ -5,3 +5,6 @@ pip_python_coreos_modules:
override_system_hostname: true override_system_hostname: true
coreos_auto_upgrade: true coreos_auto_upgrade: true
# Install epel repo on Centos/RHEL
epel_enabled: false

View file

@ -52,6 +52,7 @@
name: epel-release name: epel-release
state: present state: present
when: when:
- epel_enabled
- not is_atomic - not is_atomic
- package_python_pip.results | length != 0 - package_python_pip.results | length != 0

View file

@ -18,7 +18,7 @@
when: '"Fedora" in os_release.stdout' when: '"Fedora" in os_release.stdout'
- include_tasks: bootstrap-centos.yml - include_tasks: bootstrap-centos.yml
when: '"CentOS" in os_release.stdout' when: '"CentOS" in os_release.stdout or "Red Hat Enterprise Linux" in os_release.stdout'
- include_tasks: bootstrap-opensuse.yml - include_tasks: bootstrap-opensuse.yml
when: '"OpenSUSE" in os_release.stdout' when: '"OpenSUSE" in os_release.stdout'

View file

@ -2,13 +2,13 @@
Description=Docker Application Container Engine Description=Docker Application Container Engine
Documentation=http://docs.docker.com Documentation=http://docs.docker.com
{% if ansible_os_family == "RedHat" %} {% 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 Wants=docker-storage-setup.service
{% elif ansible_os_family == "Debian" %} {% 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 Wants=docker.socket
{% elif ansible_os_family == "Suse" %} {% 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 %} {% endif %}
[Service] [Service]

View file

@ -44,6 +44,9 @@ local_release_dir: "/tmp/releases"
# Random shifts for retrying failed ops like pushing/downloading # Random shifts for retrying failed ops like pushing/downloading
retry_stagger: 5 retry_stagger: 5
# Install epel repo on Centos/RHEL
epel_enabled: false
# DNS configuration. # DNS configuration.
# Kubernetes cluster name, also will be used as DNS domain # Kubernetes cluster name, also will be used as DNS domain
cluster_name: cluster.local cluster_name: cluster.local