Merge pull request #129 from Smana/fedora_23_compat
fix some issues with fedora 23 and dnfpull/132/head
commit
3016ab79cb
|
@ -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
|
||||
|
|
|
@ -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: ''
|
||||
|
|
|
@ -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…
Reference in New Issue