diff --git a/roles/network_plugin/calico/tasks/check.yml b/roles/network_plugin/calico/tasks/check.yml index 94a49aead..2d7c5751b 100644 --- a/roles/network_plugin/calico/tasks/check.yml +++ b/roles/network_plugin/calico/tasks/check.yml @@ -186,10 +186,10 @@ - name: "Set calico_pool_ipv6_conf" set_fact: - calico_pool_conf: '{{ calico_ipv6.stdout | from_json }}' + calico_pool_ipv6_conf: '{{ calico_ipv6.stdout | from_json }}' when: - ipv6_stack | bool - - alico_ipv6 is defined + - calico_ipv6 is defined - calico_ipv6.rc == 0 and calico_ipv6.stdout run_once: true delegate_to: "{{ groups['kube_control_plane'][0] }}" @@ -197,10 +197,10 @@ - name: "Check if ipv6 inventory match current cluster configuration" assert: that: - - calico_pool_conf.spec.blockSize | int == calico_pool_blocksize_ipv6 | int - - calico_pool_conf.spec.cidr == (calico_pool_cidr_ipv6 | default(kube_pods_subnet_ipv6)) - - not calico_pool_conf.spec.ipipMode is defined or calico_pool_conf.spec.ipipMode == calico_ipip_mode_ipv6 - - not calico_pool_conf.spec.vxlanMode is defined or calico_pool_conf.spec.vxlanMode == calico_vxlan_mode_ipv6 + - calico_pool_ipv6_conf.spec.blockSize | int == calico_pool_blocksize_ipv6 | int + - calico_pool_ipv6_conf.spec.cidr == (calico_pool_cidr_ipv6 | default(kube_pods_subnet_ipv6)) + - not calico_pool_ipv6_conf.spec.ipipMode is defined or calico_pool_ipv6_conf.spec.ipipMode == calico_ipip_mode_ipv6 + - not calico_pool_ipv6_conf.spec.vxlanMode is defined or calico_pool_ipv6_conf.spec.vxlanMode == calico_vxlan_mode_ipv6 msg: "Your ipv6 inventory doesn't match the current cluster configuration" when: - ipv6_stack | bool