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

Merge pull request #3262 from torvitas/fix_bin_path

Browse source 
[bugfix] Use bin_dir to find kubectl in contrib/metallb
This commit is contained in:
k8s-ci-robot 2018-09-13 00:51:45 -07:00 committed by GitHub
commit 53a685dbf8
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
contrib/metallb/roles/provision/tasks/main.yml
View file

@ -10,6 +10,7 @@
kube: kube:
name: "MetalLB" name: "MetalLB"
filename: "{{ kube_config_dir }}/metallb.yml" filename: "{{ kube_config_dir }}/metallb.yml"
kubectl: "{{bin_dir}}/kubectl"
state: "{{ item.changed | ternary('latest','present') }}" state: "{{ item.changed | ternary('latest','present') }}"
with_items: "{{ rendering.results }}" with_items: "{{ rendering.results }}"
when: when:

1
contrib/network-storage/heketi/roles/provision/tasks/storage.yml
View file

@ -7,5 +7,6 @@
- name: "Kubernetes Apps | Install and configure Heketi Storage" - name: "Kubernetes Apps | Install and configure Heketi Storage"
kube: kube:
name: "GlusterFS" name: "GlusterFS"
kubectl: "{{bin_dir}}/kubectl"
filename: "{{ kube_config_dir }}/heketi-storage.json" filename: "{{ kube_config_dir }}/heketi-storage.json"
state: "{{ rendering.changed | ternary('latest', 'present') }}" state: "{{ rendering.changed | ternary('latest', 'present') }}"