Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
K
Kubespray
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Model registry
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
88bee6c6
Unverified
Commit
88bee6c6
authored
Feb 3, 2021
by
forselli-stratio
Committed by
GitHub
Feb 3, 2021
Browse files
Options
Downloads
Patches
Plain Diff
Fix ansible calico route reflector tasks in calico role (#7224)
* Fix calico-rr tasks * revert stdin only when it's already a string
parent
1f84d634
Branches
Branches containing commit
Tags
Tags containing commit
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/network_plugin/calico/tasks/install.yml
+9
-7
9 additions, 7 deletions
roles/network_plugin/calico/tasks/install.yml
with
9 additions
and
7 deletions
roles/network_plugin/calico/tasks/install.yml
+
9
−
7
View file @
88bee6c6
...
@@ -138,7 +138,7 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -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 @@
...
@@ -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",
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
sign in
to comment