Skip to content

Commit

Permalink
Merge pull request kubernetes-sigs#129 from Smana/fedora_23_compat
Browse files Browse the repository at this point in the history
fix some issues with fedora 23 and dnf
  • Loading branch information
ant31 committed Feb 4, 2016
2 parents 98e2d69 + b2d6626 commit 3016ab7
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 5 deletions.
2 changes: 0 additions & 2 deletions roles/docker/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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
Expand Down
2 changes: 1 addition & 1 deletion roles/docker/vars/fedora.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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: ''
Expand Down
4 changes: 2 additions & 2 deletions roles/kubernetes/master/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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]

Expand Down

0 comments on commit 3016ab7

Please sign in to comment.