Browse Source

Merge pull request #129 from Smana/fedora_23_compat

fix some issues with fedora 23 and dnf
pull/132/head
Antoine Legrand 8 years ago
parent
commit
3016ab79cb
3 changed files with 3 additions and 5 deletions
  1. 2
      roles/docker/tasks/main.yml
  2. 2
      roles/docker/vars/fedora.yml
  3. 4
      roles/kubernetes/master/tasks/main.yml

2
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

2
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: ''

4
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]

Loading…
Cancel
Save