Browse Source

Merge pull request #93 from ansibl8s/flannel-info

Add flannel vars to enable vagrant and amazon environments
pull/98/head
Antoine Legrand 8 years ago
parent
commit
8f7d552401
2 changed files with 7 additions and 1 deletions
  1. 6
      roles/network_plugin/defaults/main.yml
  2. 2
      roles/network_plugin/templates/flannel/flannel-pod.yml

6
roles/network_plugin/defaults/main.yml

@ -0,0 +1,6 @@
---
## defines the IP used to talk to the node
# flannel_public_ip:
## interface that should be used for flannel operations
# flannel_interface:

2
roles/network_plugin/templates/flannel/flannel-pod.yml

@ -31,7 +31,7 @@
command: command:
- "/bin/sh" - "/bin/sh"
- "-c" - "-c"
- "/opt/bin/flanneld -etcd-endpoints {% for srv in groups['etcd'] %}http://{{ srv }}:2379{% if not loop.last %},{% endif %}{% endfor %} -etcd-prefix /{{ cluster_name }}/network 1>>/var/log/flannel_server.log 2>&1"
- "/opt/bin/flanneld -etcd-endpoints {% for srv in groups['etcd'] %}http://{{ srv }}:2379{% if not loop.last %},{% endif %}{% endfor %} -etcd-prefix /{{ cluster_name }}/network {% if flannel_interface is defined %}-iface {{ flannel_interface }}{% endif %} {% if flannel_public_ip is defined %}-public-ip {{ flannel_public_ip }}{% endif %} 1>>/var/log/flannel_server.log 2>&1"
ports: ports:
- hostPort: 10253 - hostPort: 10253
containerPort: 10253 containerPort: 10253

Loading…
Cancel
Save