specify weave version

roles/network_plugin/weave/defaults/main.yml

@@ -1,11 +0,0 @@
----
-
-# Flannel public IP
-# The address that flannel should advertise as how to access the system
-flannel_public_ip: "{{ access_ip|default(ip|default(ansible_default_ipv4.address)) }}"
-
-## interface that should be used for flannel operations
-## This is actually an inventory node-level item
-# flannel_interface:
-
-# cloud_provider: no

roles/network_plugin/weave/templates/docker

@@ -1,6 +1,2 @@
 # Deployed by Ansible
-{% if init_system == "sysvinit" and kube_network_plugin == "flannel" and ansible_os_family == "Debian" %}
-DOCKER_OPTS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
-{% elif kube_network_plugin == "flannel" %}
-OPTIONS="--bip={{ flannel_subnet }} --mtu={{ flannel_mtu }}"
-{% endif %}
+DOCKER_OPTS=""

roles/network_plugin/weave/templates/weave

@@ -1,4 +0,0 @@
-PEERS="{% for host in groups['k8s-cluster'] %}{{ hostvars[host]['ip'] | default( hostvars[host]['ansible_default_ipv4']['address']) }}{% if not loop.last %} {% endif %}{% endfor %}"
-{% if weave_password is defined %}
-WEAVE_PASSWORD="{{ weave_password }}"
-{% endif %}

roles/network_plugin/weave/templates/weave.j2

@@ -1,4 +1,4 @@
-WEAVE_PEERS="{% for host in groups['k8s-cluster'] %}{{ hostvars[host]['ip'] | default( hostvars[host]['ansible_default_ipv4']['address']) }}{% if not loop.last %} {% endif %}{% endfor %}"
+WEAVE_PEERS="{% for host in groups['k8s-cluster'] %}{{ hostvars[host]['access_ip'] | default(hostvars[host]['ip'] | default(hostvars[host]['ansible_default_ipv4']['address'])) }}{% if not loop.last %} {% endif %}{% endfor %}"
 WEAVEPROXY_ARGS="--rewrite-inspect --without-dns"
 WEAVE_SUBNET="--ipalloc-range {{ kube_pods_subnet }}"
 {% if weave_password is defined %}