From 64a39fdb8631b74e8561a338079701c70ad5972a Mon Sep 17 00:00:00 2001
From: Stig Telfer <stig.openstack@telfer.org>
Date: Sat, 2 Apr 2016 20:53:33 +0100
Subject: [PATCH 1/2] Use var for bin dir instead of assuming /usr/local/bin

On CoreOS the binaries are not installed in /usr/local/bin.
---
 roles/dnsmasq/tasks/main.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml
index b27947f24..87a89e293 100644
--- a/roles/dnsmasq/tasks/main.yml
+++ b/roles/dnsmasq/tasks/main.yml
@@ -43,7 +43,7 @@
   kube:
     name: dnsmasq
     namespace: kube-system
-    kubectl: /usr/local/bin/kubectl
+    kubectl: "{{bin_dir}}/kubectl"
     resource: "{{item.item.type}}"
     filename: /etc/kubernetes/{{item.item.file}}
     state: "{{item.changed | ternary('latest','present') }}"

From ab21f4d169ab84b04f60d53a87201e73599a69c5 Mon Sep 17 00:00:00 2001
From: Stig Telfer <stig.openstack@telfer.org>
Date: Sat, 2 Apr 2016 20:55:17 +0100
Subject: [PATCH 2/2] Define empty default objects for docker package
 management.

On CoreOS where there is no package management, perform zero-trip
loops instead of throwing an exception for iterating over a member
of an undefined variable.
---
 roles/docker/defaults/main.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml
index 685bc57cd..196e59b4c 100644
--- a/roles/docker/defaults/main.yml
+++ b/roles/docker/defaults/main.yml
@@ -1 +1,10 @@
 docker_version: 1.10
+
+docker_package_info:
+  pkgs:
+
+docker_repo_key_info:
+  repo_keys:
+
+docker_repo_info:
+  repos: