From b2d6626363bdf77749b1c721b879a723240326db Mon Sep 17 00:00:00 2001
From: Smana <smainklh@gmail.com>
Date: Wed, 3 Feb 2016 21:26:49 +0100
Subject: [PATCH] fix some issues with fedora 23 and dnf
---
roles/docker/tasks/main.yml | 2 --
roles/docker/vars/fedora.yml | 2 +-
roles/kubernetes/master/tasks/main.yml | 4 ++--
3 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml
index 33947b6cc..9ffff7205 100644
--- a/roles/docker/tasks/main.yml
+++ b/roles/docker/tasks/main.yml
@@ -33,7 +33,6 @@
action: "{{ docker_repo_info.pkg_repo }}"
args:
repo: "{{item}}"
- update_cache: yes
state: present
with_items: docker_repo_info.repos
when: docker_repo_info.repos|length > 0
@@ -42,7 +41,6 @@
action: "{{ docker_package_info.pkg_mgr }}"
args:
pkg: "{{item}}"
- update_cache: yes
state: latest
with_items: docker_package_info.pkgs
when: docker_package_info.pkgs|length > 0
diff --git a/roles/docker/vars/fedora.yml b/roles/docker/vars/fedora.yml
index c40c10973..7f92dfb06 100644
--- a/roles/docker/vars/fedora.yml
+++ b/roles/docker/vars/fedora.yml
@@ -3,7 +3,7 @@ docker_kernel_min_version: '0'
docker_package_info:
pkg_mgr: dnf
pkgs:
- - docker-io
+ - docker
docker_repo_key_info:
pkg_key: ''
diff --git a/roles/kubernetes/master/tasks/main.yml b/roles/kubernetes/master/tasks/main.yml
index 5dfa7c49b..26e5896cb 100644
--- a/roles/kubernetes/master/tasks/main.yml
+++ b/roles/kubernetes/master/tasks/main.yml
@@ -87,7 +87,7 @@
when: inventory_hostname == groups['kube-master'][0]
- name: Check if kube-system exists
- command: kubectl get ns kube-system
+ command: "{{ bin_dir }}/kubectl get ns kube-system"
register: 'kubesystem'
changed_when: False
ignore_errors: yes
@@ -99,7 +99,7 @@
timeout: 60
- name: Create 'kube-system' namespace
- command: kubectl create -f /etc/kubernetes/kube-system-ns.yml
+ command: "{{ bin_dir }}/kubectl create -f /etc/kubernetes/kube-system-ns.yml"
changed_when: False
when: kubesystem|failed and inventory_hostname == groups['kube-master'][0]
--
GitLab