Skip to content

Commit

Permalink
clean up ansible syntax
Browse files Browse the repository at this point in the history
  • Loading branch information
vtog committed Oct 9, 2018
1 parent 6e0d178 commit 21d1667
Show file tree
Hide file tree
Showing 10 changed files with 17 additions and 20 deletions.
2 changes: 1 addition & 1 deletion kubernetes/ansible/ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
[defaults]
retry_files_enabled = False
host_key_checking = False
inventory = ./inventory/hosts
inventory = ./inventory/hosts
2 changes: 1 addition & 1 deletion kubernetes/ansible/inventory/hosts
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,4 @@ kube-master1 ansible_host=10.1.10.21

[kube-nodes]
kube-node1 ansible_host=10.1.10.22
kube-node2 ansible_host=10.1.10.23
kube-node2 ansible_host=10.1.10.23
2 changes: 1 addition & 1 deletion kubernetes/ansible/playbooks/deploy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,4 @@
become: yes
gather_facts: no
tasks:
- import_tasks: kube-node.yaml
- import_tasks: kube-node.yaml
2 changes: 1 addition & 1 deletion kubernetes/ansible/playbooks/install-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,4 +23,4 @@
content: |
{
"exec-opts": ["native.cgroupdriver=cgroupfs"]
}
}
2 changes: 1 addition & 1 deletion kubernetes/ansible/playbooks/install-kubernetes.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
packages:
- kubelet
- kubeadm
- kubectl
- kubectl
14 changes: 6 additions & 8 deletions kubernetes/ansible/playbooks/kube-master.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,18 +8,17 @@
register: reset_cluster

- name: Generate token
shell: kubeadm token generate
shell: "kubeadm token generate"
register: token

- name: Initialize master
when: reset_cluster is successful
shell: |
kubeadm init --token {{ token.stdout }} --apiserver-advertise-address=10.1.10.21 --pod-network-cidr=10.244.0.0/16
shell: "kubeadm init --token {{ token.stdout }} --apiserver-advertise-address=10.1.10.21 --pod-network-cidr=10.244.0.0/16"
register: init_cluster

- name: Create kube admin dir (root)
file:
dest: ~/.kube/
dest: /root/.kube/
state: directory

- name: Create kube admin dir (ubuntu)
Expand All @@ -32,7 +31,7 @@
- name: Copy kube admin file (root)
copy:
src: /etc/kubernetes/admin.conf
dest: ~/.kube/config
dest: /root/.kube/config
remote_src: yes

- name: Copy kube admin file (ubuntu)
Expand All @@ -48,12 +47,11 @@

- name: Setup flannel
when: init_cluster is successful
shell: kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml
shell: "kubectl apply -f https://raw.githubusercontent.com/coreos/flannel/master/Documentation/kube-flannel.yml"

- name: Get command to join nodes to the master
shell: "kubeadm token create --print-join-command"
register: kubeadm_join
- set_fact:
kubeadm_join: "{{ kubeadm_join.stdout }}"
#- debug: msg={{ hostvars['kube-master1']['kubeadm_join'] }}

#- debug: msg={{ hostvars['kube-master1']['kubeadm_join'] }}
5 changes: 2 additions & 3 deletions kubernetes/ansible/playbooks/kube-node.yaml
Original file line number Diff line number Diff line change
@@ -1,10 +1,9 @@
---

- name: Reset kubernetes node
shell: kubeadm reset --force
shell: "kubeadm reset --force"
register: reset_cluster

- name: Initialize nodes
when: reset_cluster is successful
shell: "{{ hostvars['kube-master1']['kubeadm_join'] }}"

shell: "{{ hostvars['kube-master1']['kubeadm_join'] }}"
4 changes: 2 additions & 2 deletions kubernetes/ansible/playbooks/swapoff.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,5 @@
replace: '#\1'

- name: Disable swap
command: swapoff -a
when: ansible_swaptotal_mb > 0
shell: "swapoff -a"
when: ansible_swaptotal_mb > 0
2 changes: 1 addition & 1 deletion kubernetes/ansible/playbooks/update-hosts.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
insertafter: EOF
line: '{{ hostvars[item].ansible_host }} {{ item }}'
state: present
with_items: '{{ groups["kube-all"] }}'
with_items: '{{ groups["kube-all"] }}'
2 changes: 1 addition & 1 deletion kubernetes/ansible/playbooks/update-ubuntu.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -9,4 +9,4 @@
force_apt_get: yes
update_cache: yes
autoremove: yes
state: latest
state: latest

0 comments on commit 21d1667

Please sign in to comment.