C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #192 from oneswig/coreos-fixes

Browse source 
Coreos fixes
This commit is contained in:
Smaine Kahlouch 2016-04-03 09:32:00 +02:00
commit 652cbedee5
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
roles/dnsmasq/tasks/main.yml
View file

@ -43,7 +43,7 @@
kube: kube:
name: dnsmasq name: dnsmasq
namespace: kube-system namespace: kube-system
kubectl: /usr/local/bin/kubectl kubectl: "{{bin_dir}}/kubectl"
resource: "{{item.item.type}}" resource: "{{item.item.type}}"
filename: /etc/kubernetes/{{item.item.file}} filename: /etc/kubernetes/{{item.item.file}}
state: "{{item.changed | ternary('latest','present') }}" state: "{{item.changed | ternary('latest','present') }}"

9
roles/docker/defaults/main.yml
View file

@ -1 +1,10 @@
docker_version: 1.10 docker_version: 1.10
docker_package_info:
pkgs:
docker_repo_key_info:
repo_keys:
docker_repo_info:
repos: