Correct some incoming bugs with relation to setting the docker_version

set_fact stanza Adds a yaml= block when calling docker_opts
lazypower · Jun 2, 2015 · 70718a3 · 70718a3
1 parent 02dc0a5
commit 70718a3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/playbooks/installation-status.yaml b/playbooks/installation-status.yaml
@@ -14,8 +14,9 @@
 
 - set_fact:
     docker_version_name: docker
-    when: latest_installed
+  when: latest_installed == "True"
 
 - set_fact:
     docker_version_name: docker.io
-    when: universe_installed
+  when: universe_installed == "True"
+
diff --git a/playbooks/network-relation-changed.yaml b/playbooks/network-relation-changed.yaml
@@ -27,15 +27,16 @@
     creates: .flannel-mtu
 
 - name: set subnet daemon option
-  docker_opts: action=set key=bip val="{{ flannel_subnet }}"
+  docker_opts: action=set key=bip val="{{ flannel_subnet }}" yaml="{{opts_yaml}}"
   when: flannel_subnet != ''
   notify:
     - calculate docker opts
     - render docker defaults
     - restart docker
 
 - name: set subnet daemon option
-  docker_opts: action=set key=mtu val="{{ flannel_mtu }}"
+  docker_opts: action=set key=mtu val="{{ flannel_mtu }}" yaml="{{opts_yaml}}"
+
   when: flannel_mtu != ''
   notify:
     - calculate docker opts