kubernetes-sigs
/
kubespray
mirror of https://github.com/kubernetes-sigs/kubespray.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

restrict rpm query to redhat

pull/1514/head
Vijay Katam 2017-08-10 13:49:14 -07:00
parent 5efda3eda9
commit 7ad5523113
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
roles/docker/tasks/systemd.yml
View File

@ -13,7 +13,7 @@
- name: get systemd version - name: get systemd version
command: rpm -q --qf '%{V}\n' systemd command: rpm -q --qf '%{V}\n' systemd
register: systemd_version register: systemd_version
when: not (ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] or is_atomic) when: ansible_os_family == "RedHat" and not is_atomic
- name: Write docker.service systemd file - name: Write docker.service systemd file
template: template:

2
roles/docker/templates/docker.service.j2
View File

@ -24,7 +24,7 @@ ExecStart={{ docker_bin_dir }}/docker daemon \
$DOCKER_NETWORK_OPTIONS \ $DOCKER_NETWORK_OPTIONS \
$DOCKER_DNS_OPTIONS \ $DOCKER_DNS_OPTIONS \
$INSECURE_REGISTRY $INSECURE_REGISTRY
{% if systemd_version.stdout|int >= 226 %} {% if ansible_os_family == "RedHat" and systemd_version.stdout|int >= 226 %}
TasksMax=infinity TasksMax=infinity
{% endif %} {% endif %}
LimitNOFILE=1048576 LimitNOFILE=1048576