From bcd6ecb7fb44bec9818d7a8e4eb7acd901a59404 Mon Sep 17 00:00:00 2001
From: Greg Althaus <galthaus@austin.rr.com>
Date: Sat, 23 Jan 2016 12:27:06 -0600
Subject: [PATCH] Add flannel vars to enable vagrant and amazon environments
---
roles/network_plugin/defaults/main.yml | 6 ++++++
roles/network_plugin/templates/flannel/flannel-pod.yml | 2 +-
2 files changed, 7 insertions(+), 1 deletion(-)
create mode 100644 roles/network_plugin/defaults/main.yml
diff --git a/roles/network_plugin/defaults/main.yml b/roles/network_plugin/defaults/main.yml
new file mode 100644
index 000000000..04fece73f
--- /dev/null
+++ b/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:
diff --git a/roles/network_plugin/templates/flannel/flannel-pod.yml b/roles/network_plugin/templates/flannel/flannel-pod.yml
index 8306c91bb..36198e11a 100644
--- a/roles/network_plugin/templates/flannel/flannel-pod.yml
+++ b/roles/network_plugin/templates/flannel/flannel-pod.yml
@@ -31,7 +31,7 @@
command:
- "/bin/sh"
- "-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:
- hostPort: 10253
containerPort: 10253
--
GitLab