C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix ansible calico route reflector tasks in calico role (#7224)

Browse source 
* Fix calico-rr tasks

* revert stdin only when it's already a string

(cherry picked from commit 88bee6c68e)
This commit is contained in:
forselli-stratio 2021-02-03 16:22:29 +01:00 committed by Kubernetes Prow Robot
parent 6bde4e3fb3
commit 960844d87b
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -138,7 +138,7 @@
- name: Calico | Configure calico network pool - name: Calico | Configure calico network pool
command: command:
cmd: "{{ bin_dir }}/calicoctl.sh apply -f -" cmd: "{{ bin_dir }}/calicoctl.sh apply -f -"
stdin: "{{ stdin | to_json }}" stdin: "{{ stdin is string | ternary(stdin, stdin|to_json) }}"
vars: vars:
stdin: > stdin: >
{ "kind": "IPPool", { "kind": "IPPool",
@ -173,7 +173,7 @@
- name: Calico | Set up BGP Configuration - name: Calico | Set up BGP Configuration
command: command:
cmd: "{{ bin_dir }}/calicoctl.sh apply -f -" cmd: "{{ bin_dir }}/calicoctl.sh apply -f -"
stdin: "{{ stdin | to_json }}" stdin: "{{ stdin is string | ternary(stdin, stdin|to_json) }}"
vars: vars:
stdin: > stdin: >
{ "kind": "BGPConfiguration", { "kind": "BGPConfiguration",
@ -194,7 +194,7 @@
- name: Calico | Configure peering with router(s) at global scope - name: Calico | Configure peering with router(s) at global scope
command: command:
cmd: "{{ bin_dir }}/calicoctl.sh apply -f -" cmd: "{{ bin_dir }}/calicoctl.sh apply -f -"
stdin: "{{ stdin | to_json }}" stdin: "{{ stdin is string | ternary(stdin, stdin|to_json) }}"
vars: vars:
stdin: > stdin: >
{"apiVersion": "projectcalico.org/v3", {"apiVersion": "projectcalico.org/v3",
@ -219,7 +219,8 @@
- name: Calico | Configure peering with route reflectors at global scope - name: Calico | Configure peering with route reflectors at global scope
command: command:
cmd: "{{ bin_dir }}/calicoctl.sh apply -f -" cmd: "{{ bin_dir }}/calicoctl.sh apply -f -"
stdin: "{{ stdin | to_json }}" # revert when it's already a string
stdin: "{{ stdin is string | ternary(stdin, stdin|to_json) }}"
vars: vars:
stdin: > stdin: >
{"apiVersion": "projectcalico.org/v3", {"apiVersion": "projectcalico.org/v3",
@ -244,7 +245,8 @@
- name: Calico | Configure route reflectors to peer with each other - name: Calico | Configure route reflectors to peer with each other
command: command:
cmd: "{{ bin_dir }}/calicoctl.sh apply -f -" cmd: "{{ bin_dir }}/calicoctl.sh apply -f -"
stdin: "{{ stdin | to_json }}" # revert when it's already a string
stdin: "{{ stdin is string | ternary(stdin, stdin|to_json) }}"
vars: vars:
stdin: > stdin: >
{"apiVersion": "projectcalico.org/v3", {"apiVersion": "projectcalico.org/v3",
@ -320,7 +322,7 @@
- name: Calico | Configure node asNumber for per node peering - name: Calico | Configure node asNumber for per node peering
command: command:
cmd: "{{ bin_dir }}/calicoctl.sh apply -f -" cmd: "{{ bin_dir }}/calicoctl.sh apply -f -"
stdin: "{{ stdin | to_json }}" stdin: "{{ stdin is string | ternary(stdin, stdin|to_json) }}"
vars: vars:
stdin: > stdin: >
{"apiVersion": "projectcalico.org/v3", {"apiVersion": "projectcalico.org/v3",
@ -347,7 +349,7 @@
- name: Calico | Configure peering with router(s) at node scope - name: Calico | Configure peering with router(s) at node scope
command: command:
cmd: "{{ bin_dir }}/calicoctl.sh apply -f -" cmd: "{{ bin_dir }}/calicoctl.sh apply -f -"
stdin: "{{ stdin | to_json }}" stdin: "{{ stdin is string | ternary(stdin, stdin|to_json) }}"
vars: vars:
stdin: > stdin: >
{"apiVersion": "projectcalico.org/v3", {"apiVersion": "projectcalico.org/v3",