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
3fb9101e
Commit
3fb9101e
authored
9 years ago
by
Smaine Kahlouch
Browse files
Options
Downloads
Patches
Plain Diff
default value for 'peer_with_router'
parent
f6e4cc53
No related branches found
No related tags found
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
roles/network_plugin/tasks/calico.yml
+2
-2
2 additions, 2 deletions
roles/network_plugin/tasks/calico.yml
roles/network_plugin/templates/calico/calico-node.service.j2
+1
-1
1 addition, 1 deletion
roles/network_plugin/templates/calico/calico-node.service.j2
with
3 additions
and
3 deletions
roles/network_plugin/tasks/calico.yml
+
2
−
2
View file @
3fb9101e
...
...
@@ -38,9 +38,9 @@
-
name
:
Calico | Disable node mesh
shell
:
calicoctl bgp node-mesh off
when
:
peer_with_router
is defined and peer_with_router
and inventory_hostname in groups['kube-node']
when
:
peer_with_router
|default(false)
and inventory_hostname in groups['kube-node']
-
name
:
Calico | Configure peering with router(s)
shell
:
calicoctl node bgp peer add {{ item.router_id }} as {{ item.as }}
with_items
:
peers
when
:
peer_with_router and inventory_hostname in groups['kube-node']
when
:
peer_with_router
|default(false)
and inventory_hostname in groups['kube-node']
This diff is collapsed.
Click to expand it.
roles/network_plugin/templates/calico/calico-node.service.j2
+
1
−
1
View file @
3fb9101e
...
...
@@ -8,7 +8,7 @@ User=root
PermissionsStartOnly=true
ExecStartPre={{ bin_dir }}/calicoctl checksystem --fix
{% if inventory_hostname in groups['kube-node'] %}
{% if peer_with_router %}
{% if peer_with_router
|default(false)
%}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --as={{ local_as }} --kubernetes
{% else %}
ExecStart={{ bin_dir }}/calicoctl node --ip=${DEFAULT_IPV4} --kubernetes
...
...
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