Browse Source

use command instead of synchronize

pull/86/head
Smaine Kahlouch 8 years ago
parent
commit
cb59559835
8 changed files with 41 additions and 63 deletions
  1. 10
      roles/download/defaults/main.yml
  2. 17
      roles/download/tasks/main.yml
  3. 12
      roles/etcd/tasks/install.yml
  4. 17
      roles/kubernetes/master/tasks/main.yml
  5. 28
      roles/kubernetes/node/tasks/install.yml
  6. 9
      roles/kubernetes/node/tasks/main.yml
  7. 2
      roles/kubernetes/preinstall/tasks/main.yml
  8. 9
      roles/network_plugin/tasks/calico.yml

10
roles/download/defaults/main.yml

@ -25,24 +25,34 @@ downloads:
dest: calico/bin/calicoctl dest: calico/bin/calicoctl
sha256: "{{ calico_checksum }}" sha256: "{{ calico_checksum }}"
url: "{{ calico_download_url }}" url: "{{ calico_download_url }}"
owner: "root"
mode: "0755"
- name: calico-plugin - name: calico-plugin
dest: calico/bin/calico dest: calico/bin/calico
sha256: "{{ calico_plugin_checksum }}" sha256: "{{ calico_plugin_checksum }}"
url: "{{ calico_plugin_download_url }}" url: "{{ calico_plugin_download_url }}"
owner: "root"
mode: "0755"
- name: etcd - name: etcd
dest: "etcd/etcd-{{ etcd_version }}-linux-amd64.tar.gz" dest: "etcd/etcd-{{ etcd_version }}-linux-amd64.tar.gz"
sha256: "{{ etcd_checksum }}" sha256: "{{ etcd_checksum }}"
url: "{{ etcd_download_url }}" url: "{{ etcd_download_url }}"
unarchive: true unarchive: true
owner: "etcd"
mode: "0755"
- name: kubernetes-kubelet - name: kubernetes-kubelet
dest: kubernetes/bin/kubelet dest: kubernetes/bin/kubelet
sha256: "{{kubelet_checksum}}" sha256: "{{kubelet_checksum}}"
url: "{{ kube_download_url }}/kubelet" url: "{{ kube_download_url }}/kubelet"
owner: "kube"
mode: "0755"
- name: kubernetes-kubectl - name: kubernetes-kubectl
dest: kubernetes/bin/kubectl dest: kubernetes/bin/kubectl
sha256: "{{kubectl_checksum}}" sha256: "{{kubectl_checksum}}"
url: "{{ kube_download_url }}/kubectl" url: "{{ kube_download_url }}/kubectl"
owner: "kube"
mode: "0755"

17
roles/download/tasks/main.yml

@ -1,4 +1,19 @@
--- ---
- name: Create system kube user
user:
name=kube
comment="Kubernetes user"
shell=/sbin/nologin
state=present
system=yes
groups={{ kube_cert_group }}
- name: Create etcd user
user:
name: etcd
shell: /bin/nologin
home: /var/lib/etcd
- name: Create dest directories - name: Create dest directories
file: path={{local_release_dir}}/{{item.dest|dirname}} state=directory recurse=yes file: path={{local_release_dir}}/{{item.dest|dirname}} state=directory recurse=yes
with_items: downloads with_items: downloads
@ -8,6 +23,8 @@
url: "{{item.url}}" url: "{{item.url}}"
dest: "{{local_release_dir}}/{{item.dest}}" dest: "{{local_release_dir}}/{{item.dest}}"
sha256sum: "{{item.sha256 | default(omit)}}" sha256sum: "{{item.sha256 | default(omit)}}"
owner: "{{ item.owner|default(omit) }}"
mode: "{{ item.mode|default(omit) }}"
with_items: downloads with_items: downloads
- name: Extract archives - name: Extract archives

12
roles/etcd/tasks/install.yml

@ -1,16 +1,8 @@
--- ---
- name: INSTALL | Create etcd user
user: name=etcd shell=/bin/nologin home=/var/lib/etcd
- name: INSTALL | Copy etcd binaries - name: INSTALL | Copy etcd binaries
synchronize:
src: "{{ etcd_bin_dir }}/{{ item }}"
dest: "{{ bin_dir }}"
times: yes
archive: no
set_remote_user: false
delegate_to: "{{ inventory_hostname }}"
command: cp -pf "{{ etcd_bin_dir }}/{{ item }}" "{{ bin_dir }}"
with_items: with_items:
- etcdctl - etcdctl
- etcd - etcd
changed_when: false
notify: restart etcd notify: restart etcd

17
roles/kubernetes/master/tasks/main.yml

@ -5,17 +5,9 @@
dest: /etc/bash_completion.d/kubectl.sh dest: /etc/bash_completion.d/kubectl.sh
- name: Install kubectl binary - name: Install kubectl binary
synchronize:
src: "{{ local_release_dir }}/kubernetes/bin/kubectl"
dest: "{{ bin_dir }}/kubectl"
archive: no
checksum: yes
times: yes
set_remote_user: false
delegate_to: "{{ inventory_hostname }}"
- name: Perms kubectl binary
file: path={{ bin_dir }}/kubectl owner=kube mode=0755 state=file
command: cp -pf "{{ local_release_dir }}/kubernetes/bin/kubectl" "{{ bin_dir }}/kubectl"
changed_when: false
notify: restart kubelet
- name: populate users for basic auth in API - name: populate users for basic auth in API
lineinfile: lineinfile:
@ -46,8 +38,7 @@
template: template:
src: manifests/kube-apiserver.manifest.j2 src: manifests/kube-apiserver.manifest.j2
dest: "{{ kube_manifest_dir }}/kube-apisever.manifest" dest: "{{ kube_manifest_dir }}/kube-apisever.manifest"
notify:
- restart kubelet
notify: restart kubelet
- meta: flush_handlers - meta: flush_handlers

28
roles/kubernetes/node/tasks/install.yml

@ -18,34 +18,16 @@
notify: restart kubelet notify: restart kubelet
- name: install | Install kubelet binary - name: install | Install kubelet binary
synchronize:
src: "{{ local_release_dir }}/kubernetes/bin/kubelet"
dest: "{{ bin_dir }}/kubelet"
times: yes
archive: no
set_remote_user: false
delegate_to: "{{ inventory_hostname }}"
notify:
- restart kubelet
- name: install | Perms kubelet binary
file: path={{ bin_dir }}/kubelet owner=kube mode=0755 state=file
command: cp -pf "{{ local_release_dir }}/kubernetes/bin/kubelet" "{{ bin_dir }}/kubelet"
changed_when: false
notify: restart kubelet
- name: install | Calico-plugin | Directory - name: install | 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: install | Calico-plugin | Binary - name: install | Calico-plugin | Binary
synchronize:
src: "{{ local_release_dir }}/calico/bin/calico"
dest: "/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico"
times: yes
archive: no
set_remote_user: false
delegate_to: "{{ inventory_hostname }}"
command: cp -pf "{{ local_release_dir }}/calico/bin/calico" "/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico"
when: kube_network_plugin == "calico" when: kube_network_plugin == "calico"
changed_when: false
notify: restart kubelet notify: restart kubelet
- name: install | Perms calico plugin binary
file: path=/usr/libexec/kubernetes/kubelet-plugins/net/exec/calico/calico owner=kube mode=0755 state=file
when: kube_network_plugin == "calico"

9
roles/kubernetes/node/tasks/main.yml

@ -12,15 +12,6 @@
- name: certs | create system kube-cert groups - name: certs | create system kube-cert groups
group: name={{ kube_cert_group }} state=present system=yes group: name={{ kube_cert_group }} state=present system=yes
- name: create system kube user
user:
name=kube
comment="Kubernetes user"
shell=/sbin/nologin
state=present
system=yes
groups={{ kube_cert_group }}
- include: secrets.yml - include: secrets.yml
tags: tags:
- secrets - secrets

2
roles/kubernetes/preinstall/tasks/main.yml

@ -17,7 +17,7 @@
- name: "Identify init system" - name: "Identify init system"
shell: > shell: >
$(pgrep systemd > /dev/null && systemctl status network > /dev/null);
$(pgrep systemd > /dev/null && systemctl status network.target > /dev/null);
if [ $? -eq 0 ] ; then if [ $? -eq 0 ] ; then
echo systemd; echo systemd;
else else

9
roles/network_plugin/tasks/calico.yml

@ -1,12 +1,7 @@
--- ---
- name: Calico | Install calicoctl bin - name: Calico | Install calicoctl bin
synchronize:
src: "{{ local_release_dir }}/calico/bin/calicoctl"
dest: "{{ bin_dir }}/calicoctl"
archive: no
times: yes
set_remote_user: false
delegate_to: "{{ inventory_hostname }}"
command: cp -pf "{{ local_release_dir }}/calico/bin/calicoctl" "{{ bin_dir }}/calicoctl"
changed_when: false
notify: restart calico-node notify: restart calico-node
- name: Calico | install calicoctl - name: Calico | install calicoctl

Loading…
Cancel
Save