diff --git a/roles/dnsmasq/tasks/main.yml b/roles/dnsmasq/tasks/main.yml index b27947f244eb81927841ef66a41f1ae1155eeeb7..87a89e293ff437383b5cf6dee04a081299bd3747 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') }}" diff --git a/roles/docker/defaults/main.yml b/roles/docker/defaults/main.yml index 685bc57cd12f73681a01578996180909513b4c4e..196e59b4cd41c3b1886816b3063814ba91889048 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: