mirror of
https://github.com/kubernetes-sigs/kubespray.git
synced 2026-02-01 09:38:12 -03:30
Better fix for different CoreOS os family facts
Signed-off-by: Bogdan Dobrelya <bogdando@mail.ru>
This commit is contained in:
@@ -1,6 +1,6 @@
|
||||
dependencies:
|
||||
- role: etcd
|
||||
- role: docker
|
||||
when: ansible_os_family != "Container Linux by CoreOS"
|
||||
when: not ansible_os_family in ["CoreOS", "Container Linux by CoreOS"]
|
||||
- role: download
|
||||
file: "{{ downloads.calico_rr }}"
|
||||
|
||||
@@ -20,7 +20,7 @@
|
||||
service:
|
||||
name: docker.socket
|
||||
state: restarted
|
||||
when: ansible_os_family == 'Container Linux by CoreOS'
|
||||
when: ansible_os_family in ['CoreOS', 'Container Linux by CoreOS']
|
||||
|
||||
- name: Flannel | reload docker
|
||||
service:
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
[Service]
|
||||
{% if ansible_os_family == "Container Linux by CoreOS" %}
|
||||
{% if ansible_os_family in ["CoreOS", "Container Linux by CoreOS"] %}
|
||||
Environment="DOCKER_OPT_BIP=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
|
||||
{% else %}
|
||||
Environment="DOCKER_NETWORK_OPTIONS=--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
|
||||
|
||||
Reference in New Issue
Block a user