Skip to content
Open
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 2 additions & 6 deletions roles/network_plugin/calico/templates/calico-config.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -56,12 +56,8 @@ data:
{% else %}
"ipam": {
"type": "calico-ipam",
{% if ipv4_stack %}
"assign_ipv4": "true"{{ ',' if (ipv6_stack and ipv4_stack) }}
{% endif %}
{% if ipv6_stack %}
"assign_ipv6": "true"
{% endif %}
"assign_ipv4": "{{ ipv4_stack | to_json }}",
"assign_ipv6": "{{ ipv6_stack | to_json }}"
},
{% endif %}
{% if calico_allow_ip_forwarding %}
Expand Down
4 changes: 4 additions & 0 deletions roles/network_plugin/calico/templates/calico-node.yml.j2
Original file line number Diff line number Diff line change
Expand Up @@ -259,6 +259,10 @@ spec:
# no effect. This should fall within `--cluster-cidr`.
# - name: CALICO_IPV4POOL_CIDR
# value: "192.168.0.0/16"
{% if not ipv4_stack %}
Comment thread
AbhiiTen marked this conversation as resolved.
Outdated
- name: CALICO_IPV4POOL_CIDR
value: "none"
{% endif %}
Comment thread
AbhiiTen marked this conversation as resolved.
Outdated
- name: CALICO_IPV4POOL_IPIP
value: "{{ calico_ipv4pool_ipip }}"
# Enable or Disable VXLAN on the default IP pool.
Expand Down