Remove local dep. downloader

pull/42/head
ant31 2016-01-04 14:58:27 +01:00
parent 2a08f7bc0a
commit 8fa0110e28
4 changed files with 52 additions and 23 deletions

View File

@ -5,11 +5,17 @@
dest: /etc/bash_completion.d/kubectl.sh dest: /etc/bash_completion.d/kubectl.sh
- name: Install kubectl binary - name: Install kubectl binary
copy: synchronize:
src={{ local_release_dir }}/kubernetes/bin/kubectl src: "{{ local_release_dir }}/kubernetes/bin/kubectl"
dest={{ bin_dir }} dest: "{{ bin_dir }}/kubectl"
owner=kube mode: pull
mode=0755 archive: no
checksum: yes
times: yes
delegate_to: "{{ groups['downloader'][0] }}"
- name: Perms kubectl binary
file: path={{ bin_dir }}/kubelet owner=kube mode=0755 state=file
- name: populate users for basic auth in API - name: populate users for basic auth in API
lineinfile: lineinfile:

View File

@ -15,22 +15,33 @@
notify: restart kubelet notify: restart kubelet
- name: Install kubelet binary - name: Install kubelet binary
copy: synchronize:
src={{ local_release_dir }}/kubernetes/bin/kubelet src: "{{ local_release_dir }}/kubernetes/bin/kubelet"
dest={{ bin_dir }} dest: "{{ bin_dir }}/kubelet"
owner=kube mode: pull
mode=0755 times: yes
archive: no
delegate_to: "{{ groups['downloader'][0] }}"
notify: notify:
- restart kubelet - restart kubelet
- name: Perms kubelet binary
file: path={{ bin_dir }}/kubelet owner=kube mode=0755 state=file
- name: Calico-plugin | Directory - name: Calico-plugin | Directory
file: path=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/ state=directory file: path=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/ state=directory
when: kube_network_plugin == "calico" when: kube_network_plugin == "calico"
- name: Calico-plugin | Binary - name: Calico-plugin | Binary
copy: synchronize:
src={{ local_release_dir }}/calico/bin/calico src: "{{ local_release_dir }}/calico/bin/calico"
dest=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico dest: "/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico"
mode=0755 mode: "pull"
times: yes
archive: no
delegate_to: "{{ groups['downloader'][0] }}"
when: kube_network_plugin == "calico" when: kube_network_plugin == "calico"
notify: restart kubelet notify: restart kubelet
- name: Perms calico plugin binary
file: path=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico owner=kube mode=0755 state=file

View File

@ -1,11 +1,18 @@
--- ---
- name: Calico | Install calicoctl bin - name: Calico | Install calicoctl bin
copy: synchronize:
src: "{{ local_release_dir }}/calico/bin/calicoctl" src: "{{ local_release_dir }}/calico/bin/calicoctl"
dest: "{{ bin_dir }}" dest: "{{ bin_dir }}/calicoctl"
mode: 0755 mode: pull
archive: no
times: yes
delegate_to: "{{ groups['downloader'][0] }}"
notify: restart calico-node notify: restart calico-node
- name: Calico | install calicoctl
file: path={{ bin_dir }}/calicoctl mode=0755 state=file
- name: Calico | Create calicoctl symlink (needed by kubelet) - name: Calico | Create calicoctl symlink (needed by kubelet)
file: file:
src: /usr/local/bin/calicoctl src: /usr/local/bin/calicoctl
@ -39,7 +46,7 @@
fail: fail:
msg: 'Only one network pool must be configured and it must be the subnet {{ kube_pods_subnet }}. msg: 'Only one network pool must be configured and it must be the subnet {{ kube_pods_subnet }}.
Please erase calico configuration and run the playbook again ("etcdctl rm --recursive /calico/v1/ipam/v4/pool")' Please erase calico configuration and run the playbook again ("etcdctl rm --recursive /calico/v1/ipam/v4/pool")'
when: ( calico_pools.json['node']['nodes'] | length > 1 ) or when: ( calico_pools.json['node']['nodes'] | length > 1 ) or
( not calico_pools.json['node']['nodes'][0]['key'] | search(".*{{ kube_pods_subnet | ipaddr('network') }}.*") ) ( not calico_pools.json['node']['nodes'][0]['key'] | search(".*{{ kube_pods_subnet | ipaddr('network') }}.*") )
run_once: true run_once: true
delegate_to: "{{ groups['etcd'][0] }}" delegate_to: "{{ groups['etcd'][0] }}"

View File

@ -3,14 +3,19 @@
user: name=flannel shell=/bin/nologin user: name=flannel shell=/bin/nologin
- name: Install flannel binaries - name: Install flannel binaries
copy: synchronize:
src={{ local_release_dir }}/flannel/bin/flanneld src: "{{ local_release_dir }}/flannel/bin/flanneld"
dest={{ bin_dir }} dest: "{{ bin_dir }}/flanneld"
owner=flannel mode: pull
mode=u+x archive: no
times: yes
delegate_to: "{{ groups['downloader'][0] }}"
notify: notify:
- restart flannel - restart flannel
- name: Perms flannel binary
file: path={{ bin_dir }}/flanneld owner=flannel mode=0755 state=file
- name: Write flannel.service systemd file - name: Write flannel.service systemd file
template: template:
src: flannel/systemd-flannel.service.j2 src: flannel/systemd-flannel.service.j2