Updates to flannel configuration.

Author: markramach

roles/docker-flannel/tasks/main.yml

@@ -16,15 +16,21 @@
     flannel_mtu: "{{ flannel_mtu.stdout }}"
     flannel_subnet: "{{ flannel_subnet.stdout }}"
 
+- debug: msg={{ flannel_mtu }}
+- debug: msg={{ flannel_subnet }}
+
 - name: Shutdown the docker service for a restart.
   command: stop docker
+  ignore_errors: yes
 
 - name: Shutdown the existing docker bridge interface.
   command: ip link set dev docker0 down
+  ignore_errors: yes
 
 - name: Remove the existing docker bridge interface.
   command: brctl delbr docker0
-
+  ignore_errors: yes
+  
 - name: Update docker with flannel configuration.
   lineinfile: dest=/etc/default/docker regexp='^DOCKER_OPTS' line='DOCKER_OPTS="-H tcp://127.0.0.1:4243 -H unix:///var/run/docker.sock --bip={{ flannel_subnet }} --mtu={{ flannel_mtu }} {{ docker_opts }}"'
 

roles/docker/tasks/main.yml

@@ -13,7 +13,7 @@
 - name: Add entry ubuntu 14.04.
   lineinfile: dest=/etc/apt/sources.list.d/docker.list line="deb https://apt.dockerproject.org/repo ubuntu-trusty main" regexp="(.*).(dockerproject).(.*)"
 
-- name: Update installed packegs to latest version.
+- name: Update installed packages to latest version.
   apt: upgrade=yes
 
 - name: Update packages.
@@ -29,4 +29,4 @@
   service: name=docker enabled=yes
 
 - name: Ensure docker service is started.
-  service: name=docker state=started
+  command: service docker restart

roles/flannel-client/templates/flanneld.conf.j2

@@ -3,8 +3,8 @@ author "mark ramach"
 
 script
 
-	FLANNELD_OPTS="-etcd-endpoints='{{ etcd_endpoint }}' -etcd-prefix='/coreos.com/network'"
+	FLANNELD_OPTS="-etcd-endpoints={{ etcd_endpoint }} -etcd-prefix=/coreos.com/network"
 
-	exec flanneld $FLANNELD_OPTS > /var/log/flanneld.log
+	exec flanneld $FLANNELD_OPTS
 
 end script

roles/flannel-network/defaults/main.yml

@@ -1,2 +1,2 @@
 etcd_endpoint: http://127.0.0.1:4001
-flannel_network: 10.1.0.0/16
+flannel_network: 18.16.0.0/16

roles/flannel/tasks/main.yml

@@ -1,5 +1,5 @@
 - name: Download flannel release.
-  get_url: url={{ flannel_url }} dest=/tmp/{{ flannel_version}}.tar.gz
+  get_url: url={{ flannel_url }} dest=/tmp/{{ flannel_version}}.tar.gz validate_certs=no
 
 - name: Unarchive flannel release.
   unarchive: src=/tmp/{{ flannel_version }}.tar.gz dest=/var/lib/ copy=false group=root owner=root mode=755