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

fix some issues with fedora 23 and dnf

Browse source
This commit is contained in:
Smana 2016-02-03 21:26:49 +01:00
parent 98e2d6957a
commit b2d6626363
3 changed files with 3 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -33,7 +33,6 @@
action: "{{ docker_repo_info.pkg_repo }}" action: "{{ docker_repo_info.pkg_repo }}"
args: args:
repo: "{{item}}" repo: "{{item}}"
update_cache: yes
state: present state: present
with_items: docker_repo_info.repos with_items: docker_repo_info.repos
when: docker_repo_info.repos|length > 0 when: docker_repo_info.repos|length > 0
@ -42,7 +41,6 @@
action: "{{ docker_package_info.pkg_mgr }}" action: "{{ docker_package_info.pkg_mgr }}"
args: args:
pkg: "{{item}}" pkg: "{{item}}"
update_cache: yes
state: latest state: latest
with_items: docker_package_info.pkgs with_items: docker_package_info.pkgs
when: docker_package_info.pkgs|length > 0 when: docker_package_info.pkgs|length > 0

2
roles/docker/vars/fedora.yml
View file

@ -3,7 +3,7 @@ docker_kernel_min_version: '0'
docker_package_info: docker_package_info:
pkg_mgr: dnf pkg_mgr: dnf
pkgs: pkgs:
- docker-io - docker
docker_repo_key_info: docker_repo_key_info:
pkg_key: '' pkg_key: ''

4
roles/kubernetes/master/tasks/main.yml
View file

@ -87,7 +87,7 @@
when: inventory_hostname == groups['kube-master'][0] when: inventory_hostname == groups['kube-master'][0]
- name: Check if kube-system exists - name: Check if kube-system exists
command: kubectl get ns kube-system command: "{{ bin_dir }}/kubectl get ns kube-system"
register: 'kubesystem' register: 'kubesystem'
changed_when: False changed_when: False
ignore_errors: yes ignore_errors: yes
@ -99,7 +99,7 @@
timeout: 60 timeout: 60
- name: Create 'kube-system' namespace - 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 changed_when: False
when: kubesystem|failed and inventory_hostname == groups['kube-master'][0] when: kubesystem|failed and inventory_hostname == groups['kube-master'][0]