temp

.drone.yml

@@ -10,15 +10,16 @@ steps:
     image: registry.fedy95.com/baseimage-yamllint:latest
     commands:
       - yamllint -c /yamllint/relaxed.yaml group_vars/all.yml
+      - yamllint -c /yamllint/relaxed.yaml playbooks/docker-units/init.yml
+      - yamllint -c /yamllint/relaxed.yaml playbooks/k8s/init.yml
       - yamllint -c /yamllint/relaxed.yaml roles/common/tasks/main.yml
       - yamllint -c /yamllint/relaxed.yaml roles/docker/defaults/main.yml
       - yamllint -c /yamllint/relaxed.yaml roles/docker/handlers/main.yml
-      - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/docker.yml
-      - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/docker-compose.yml
       - yamllint -c /yamllint/relaxed.yaml roles/docker/tasks/main.yml
-      - yamllint -c /yamllint/relaxed.yaml roles/docker/vars/main.yml
+      - yamllint -c /yamllint/relaxed.yaml roles/docker-compose/tasks/main.yml
+      - yamllint -c /yamllint/relaxed.yaml roles/docker-compose/vars/main.yml
+      - yamllint -c /yamllint/relaxed.yaml roles/k8s-init-machines/tasks/main.yml
       - yamllint -c /yamllint/relaxed.yaml .drone.yml
-      - yamllint -c /yamllint/relaxed.yaml ansible-desktop.yml
     when:
       event: pull_request
 ...

Makefile

@@ -10,19 +10,28 @@ LINT-YAML-CMD=docker run --rm -it -v $(PWD):/data ${REGISTRY}/${YAMLLINT_TAG}
 lint-yaml:
 	docker pull ${REGISTRY}/${YAMLLINT_TAG}
 	$(LINT-YAML-CMD) group_vars/all.yml
-	$(LINT-YAML-CMD) playbooks/ansible-desktop.yml
+	$(LINT-YAML-CMD) playbooks/docker-units/init.yml
+	$(LINT-YAML-CMD) playbooks/k8s/init.yml
 	$(LINT-YAML-CMD) roles/common/tasks/main.yml
 	$(LINT-YAML-CMD) roles/docker/defaults/main.yml
 	$(LINT-YAML-CMD) roles/docker/handlers/main.yml
 	$(LINT-YAML-CMD) roles/docker/tasks/main.yml
 	$(LINT-YAML-CMD) roles/docker-compose/tasks/main.yml
 	$(LINT-YAML-CMD) roles/docker-compose/vars/main.yml
+	$(LINT-YAML-CMD) roles/k8s-init-machines/tasks/main.yml
 	$(LINT-YAML-CMD) .drone.yml
 
+check-playbooks-syntax:
+	ansible-playbook playbooks/docker-units/init.yml -i inventory/hosts --syntax-check
+	ansible-playbook playbooks/k8s/init.yml -i inventory/hosts --syntax-check
+
 docker-units-init:
 	ansible-playbook playbooks/docker-units/init.yml -i inventory/hosts --ask-become-pass
 
+k8s-units-init:
+	ansible-playbook playbooks/k8s/init.yml -i inventory/hosts --ask-become-pass
+
 ping:
-	ansible -i hosts all -m ping
+	ansible -i inventory/hosts all -m ping
 
 .DEFAULT_GOAL := lint

ansible.cfg

@@ -1,6 +1,8 @@
 [defaults]
 hostfile = hosts
 nocows = 1
+inventory = inventory
+roles_path = roles
 
 [privilege_escalation]
 become_method = sudo

group_vars/all.yml

@@ -1,5 +0,0 @@
----
-aptcachetime: 3600
-locale: "en_US.UTF-8"
-timezone: "Europe/Moscow"
-...

inventory/hosts

@@ -18,3 +18,4 @@ pi-hole       ansible_host=192.168.1.151
 ansible_connection=ssh
 ansible_ssh_private_key_file=/home/fedy95/.ssh/id_rsa
 ansible_user=fedy95
+aptcachetime=3600

playbooks/k8s/init.yml

@@ -1,18 +1,19 @@
 ---
 - name: k8s-units playbook
   hosts: k8s
+  become: true
   roles:
-    - { role: common, become: true }
-    - { role: docker, become: true }
-    - { role: k8s, become: true }
+    - common
+    - docker
+    - k8s-init-machines
 
-- name: k8s playbook
-  hosts: k8s-master
-  roles:
-    - { role: common, become: true }
-
-- name: k8s playbook
-  hosts: k8s-worker
-  roles:
-    - { role: common, become: true }
+#- name: k8s playbook
+#  hosts: k8s-master
+#  roles:
+#    - { role: common, become: true }
+#
+#- name: k8s playbook
+#  hosts: k8s-worker
+#  roles:
+#    - { role: common, become: true }
 ...

roles/common/tasks/main.yml

@@ -25,5 +25,4 @@
 
 - name: Upgrade installed packages
   apt: upgrade=yes
-
 ...

roles/k8s-init-machines/tasks/main.yml

@@ -0,0 +1,43 @@
+---
+- name: Disable all swaps from /proc/swaps
+  shell: |
+    swapoff --all
+
+- name: Disable SWAP in fstab
+  lineinfile:
+    path: /etc/fstab
+    regexp: 'swap'
+    state: absent
+
+- name: Add Google GPG key
+  apt_key:
+    url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
+    state: present
+
+- name: Add Kubernetes' APT repository
+  apt_repository:
+    repo: deb http://apt.kubernetes.io/ kubernetes-xenial main
+    state: present
+    filename: 'kubernetes'
+    mode: 0600
+
+- name: Installing Kubernetes Cluster Packages
+  apt:
+    name: "{{ item }}"
+    state: present
+    cache_valid_time: "{{ aptcachetime }}"
+  loop: [ 'kubeadm', 'kubectl', 'kubelet' ]
+
+- name: Enable service kubelet persistently
+  service:
+    name: kubelet
+    enabled: yes
+
+# TODO ???
+#- name: Reboot all the kubernetes nodes.
+#  reboot:
+#    post_reboot_delay: 10
+#    reboot_timeout: 40
+#    connect_timeout: 60
+#    test_command: uptime
+...

roles/k8s/tasks/01_prepare.yml

@@ -1,48 +0,0 @@
----
-- hosts: k8s
-  - name: Disable all swaps from /proc/swaps
-    shell: |
-      swapoff --all
-
-  - name: Disable SWAP in fstab
-    lineinfile:
-      path: /etc/fstab
-      regexp: 'swap'
-      state: absent
-
-  - name: Add Google GPG key
-    apt_key:
-      url: https://packages.cloud.google.com/apt/doc/apt-key.gpg
-      state: present
-
-  - name: Add Kubernetes' APT repository
-    apt_repository:
-      repo: deb http://apt.kubernetes.io/ kubernetes-xenial main
-      state: present
-      filename: 'kubernetes'
-      mode: 0600
-
-  - name: Installing Kubernetes Cluster Packages
-    apt:
-      name: "{{ item }}"
-      state: present
-      cache_valid_time: "{{ aptcachetime }}"
-    with_items:
-      - kubelet-{{kubelet_version}}
-      - kubeadm
-      - kubectl
-    loop: [ 'kubeadm', 'kubectl', 'kubelet' ]
-
-  - name: Enable service kubelet persistently
-    service:
-      name: kubelet
-      enabled: yes
-
-# TODO ???
-#  - name: Reboot all the kubernetes nodes.
-#    reboot:
-#      post_reboot_delay: 10
-#      reboot_timeout: 40
-#      connect_timeout: 60
-#      test_command: uptime
-...

roles/k8s/vars/main.yml

@@ -1,3 +0,0 @@
----
-kubelet_version: "1.14.0-00"
-...