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

Fix yaml checks

Browse Source
This commit is contained in:
mlushpenko
2018-09-06 16:26:57 +02:00
parent f958b32c83
commit ea2c9d8f57
6 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
roles/network_plugin/calico/defaults/main.yml
View File

@@ -2,7 +2,7 @@
# Enables Internet connectivity from containers
nat_outgoing: true
#add default ippool name
# add default ippool name
calico_pool_name: "default-pool"
# Use IP-over-IP encapsulation across hosts

16
roles/network_plugin/calico/tasks/install.yml
View File

@@ -164,10 +164,10 @@
delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ peers|default([]) }}"
when:
- calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled
- peer_with_router|default(false)
- inventory_hostname in groups['k8s-cluster']
- calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled
- peer_with_router|default(false)
- inventory_hostname in groups['k8s-cluster']
- name: Calico | Configure peering with route reflectors
shell: >
@@ -208,10 +208,10 @@
delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ groups['calico-rr'] | default([]) }}"
when:
- calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled
- peer_with_calico_rr|default(false)
- hostvars[item]['cluster_id'] == cluster_id
- calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- not calico_upgrade_enabled
- peer_with_calico_rr|default(false)
- hostvars[item]['cluster_id'] == cluster_id
- name: Calico | Create calico manifests