Merge lp:~lazypower/charms/trusty/flannel-docker/trunk into lp:charms/trusty/flannel-docker

[Charles Butler]

Older revisions of the charm had edgecase breakage when working with multiple clusters.

The flannel charm now supports working with 2 docker clusters, such as the following

juju deploy cs:~kubernetes/trusty/etcd

juju deploy trusty/docker cluster1
juju add-unit -n 5 cluster1

juju deploy trusty/docker cluster2
juju add-unit -n 5 cluster2

juju deploy flannel-docker
juju add-relation flannel-docker:docker-host cluster1
juju add-relation flannel-docker:docker-host cluster2
juju add-relation flannel-docker:db etcd:client
juju add-relation flannel-docker:network cluster1:network
juju add-relation flannel-docker:network cluster2:network

[Matt Bruzek (mbruzek)]

Greetings Charles!

Thanks for the latest fixes to the flannel-docker charm! The ansible code
change looks safe and logical. I ran this latest
code on our CI system and saw it pass on Azure, HP, and Joyent. I also
deployed the scenario that you listed in the description which worked fine.

I merged your changes with the exising flannel-docker charm. Thank you for
this quality submission!

review: Approve

=== modified file 'playbooks/network-relation-changed.yaml'
--- playbooks/network-relation-changed.yaml	2015-04-01 18:46:10 +0000
+++ playbooks/network-relation-changed.yaml	2015-05-21 15:36:49 +0000
@@ -3,10 +3,6 @@
 # Note: this is necessary when being called from
 # network-relation-changed, not from db-relation-joined.
 
-- name: Find Docker-Host network relation-id
-  shell: relation-ids network
-  register: docker_host_rel_id
-
 # Read data from flannel config
 - name: Read Flannel Subnet
   shell: cat /run/flannel/subnet.env | grep FLANNEL_SUBNET | cut -f2 -d"="
@@ -17,10 +13,10 @@
   register: flannel_mtu
 
 - set_fact:
-    host_rel_id: "{{ docker_host_rel_id.stdout }}"
     flannel_mtu: "{{ flannel_mtu.stdout }}"
     flannel_subnet: "{{ flannel_subnet.stdout }}"
+    scoped_network: "{{ relations.network[0].__relid__ | default('') }}"
 
 - name: Send Data to Docker Host for bridge configuration
-  shell: relation-set -r {{ host_rel_id }} flannel-subnet={{ flannel_subnet  }} flannel-mtu={{ flannel_mtu }} overlay_type=udp
-  when: host_rel_id != ""
+  shell: relation-set -r {{ scoped_network }} flannel-subnet={{ flannel_subnet  }} flannel-mtu={{ flannel_mtu }} overlay_type=udp
+  when: scoped_network != ""