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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Mirror
Kubespray
Commits
f4b7474a
Commit
f4b7474a
authored
8 years ago
by
Matthew Mosesohn
Committed by
GitHub
8 years ago
Browse files
Options
Downloads
Plain Diff
Merge pull request #926 from adidenko/fix-calico-rr-for-masters
Fix calico-rr peering with k8s masters
parents
94283216
f05aaeb3
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
roles/network_plugin/calico/tasks/main.yml
+6
-6
6 additions, 6 deletions
roles/network_plugin/calico/tasks/main.yml
with
6 additions
and
6 deletions
roles/network_plugin/calico/tasks/main.yml
+
6
−
6
View file @
f4b7474a
...
...
@@ -193,7 +193,7 @@
-
name
:
Calico | Disable node mesh
shell
:
"
{{
bin_dir
}}/calicoctl
config
set
nodeToNodeMesh
off"
when
:
((peer_with_router|default(false) or peer_with_calico_rr|default(false))
and inventory_hostname in groups['k
ube-node
']
and inventory_hostname in groups['k
8s-cluster
']
and not legacy_calicoctl)
run_once
:
true
...
...
@@ -208,7 +208,7 @@
| {{ bin_dir }}/calicoctl create -f -
with_items
:
"
{{
peers|default([])
}}"
when
:
(not legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['k
ube-node
'])
peer_with_router|default(false) and inventory_hostname in groups['k
8s-cluster
'])
-
name
:
Calico | Configure peering with route reflectors
shell
:
>
...
...
@@ -223,13 +223,13 @@
| {{ bin_dir }}/calicoctl create --skip-exists -f -
with_items
:
"
{{
groups['calico-rr']
|
default([])
}}"
when
:
(not legacy_calicoctl and
peer_with_calico_rr|default(false) and inventory_hostname in groups['k
ube-node
']
peer_with_calico_rr|default(false) and inventory_hostname in groups['k
8s-cluster
']
and hostvars[item]['cluster_id'] == cluster_id)
-
name
:
Calico (old) | Disable node mesh
shell
:
"
{{
bin_dir
}}/calicoctl
bgp
node-mesh
off"
when
:
((peer_with_router|default(false) or peer_with_calico_rr|default(false))
and inventory_hostname in groups['k
ube-node
']
and inventory_hostname in groups['k
8s-cluster
']
and legacy_calicoctl)
run_once
:
true
...
...
@@ -237,11 +237,11 @@
shell
:
"
{{
bin_dir
}}/calicoctl
node
bgp
peer
add
{{
item.router_id
}}
as
{{
item.as
}}"
with_items
:
"
{{
peers|default([])
}}"
when
:
(legacy_calicoctl and
peer_with_router|default(false) and inventory_hostname in groups['k
ube-node
'])
peer_with_router|default(false) and inventory_hostname in groups['k
8s-cluster
'])
-
name
:
Calico (old) | Configure peering with route reflectors
shell
:
"
{{
bin_dir
}}/calicoctl
node
bgp
peer
add
{{
hostvars[item]['calico_rr_ip']|default(hostvars[item]['ip'])
}}
as
{{
local_as
|
default(global_as_num)
}}"
with_items
:
"
{{
groups['calico-rr']
|
default([])
}}"
when
:
(legacy_calicoctl and
peer_with_calico_rr|default(false) and inventory_hostname in groups['k
ube-node
']
peer_with_calico_rr|default(false) and inventory_hostname in groups['k
8s-cluster
']
and hostvars[item]['cluster_id'] == cluster_id)
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
register
or
sign in
to comment