Browse Source

Merge pull request #192 from oneswig/coreos-fixes

Coreos fixes
pull/193/head
Smaine Kahlouch 9 years ago
parent
commit
652cbedee5
2 changed files with 10 additions and 1 deletions
  1. 2
      roles/dnsmasq/tasks/main.yml
  2. 9
      roles/docker/defaults/main.yml

2
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') }}"

9
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:
Loading…
Cancel
Save