Skip to content
This repository has been archived by the owner on Jul 7, 2020. It is now read-only.

Ansible/deprecation warnings #556

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion vagrant/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@ Vagrant.configure("2") do |config|
ansible.limit = "all"
ansible.playbook = "site.yml"
ansible.groups = {
"master" => ["master"],
"masters" => ["master"],
"nodes" => (0..NODES-1).map {|j| "node#{j}"},
}
ansible.extra_vars = {
Expand Down
6 changes: 3 additions & 3 deletions vagrant/gcr_proxy.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- hosts: master
- hosts: masters
become: yes
become_method: sudo
vars_files:
Expand All @@ -7,7 +7,7 @@
- include_role:
name: master
tasks_from: gcr_proxy.yml
when: custom_registry_gcr | default(false)
when: custom_registry_gcr is default(false)

- hosts: nodes
become: yes
Expand All @@ -18,4 +18,4 @@
- include_role:
name: nodes
tasks_from: gcr_proxy.yml
when: custom_registry_gcr | default(false)
when: custom_registry_gcr is default(false)
4 changes: 2 additions & 2 deletions vagrant/roles/common/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -137,11 +137,11 @@

- name: install fixed kubelet-kubeadm config file (1.8 and later)
copy: src=10-kubeadm-post-1.8.conf dest=/etc/systemd/system/kubelet.service.d/10-kubeadm.conf owner=root group=root mode=644 backup=yes
when: kube_ver.stdout | version_compare('1.8', '>=')
when: kube_ver.stdout is version_compare('1.8', '>=')

- name: install fixed kubelet-kubeadm config file
copy: src=10-kubeadm.conf dest=/etc/systemd/system/kubelet.service.d/ owner=root group=root mode=644 backup=yes
when: kube_ver.stdout | version_compare('1.8', '<')
when: kube_ver.stdout is version_compare('1.8', '<')

- name: copy docker conf
template: src=docker.j2 dest=/etc/sysconfig/docker force=yes mode=0644
Expand Down
2 changes: 1 addition & 1 deletion vagrant/roles/master/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
- include: gcr_proxy.yml
- include_tasks: gcr_proxy.yml
when:
- custom_registry is defined
- custom_registry_gcr | default(false)
Expand Down
2 changes: 1 addition & 1 deletion vagrant/roles/nodes/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
- name: Open ports 49152-49251 (GlusterFS bricks)
firewalld: port=49152-49251/tcp zone=trusted permanent=true state=enabled immediate=true

- include: gcr_proxy.yml
- include_tasks: gcr_proxy.yml
when:
- custom_registry is defined
- custom_registry_gcr | default(false)
Expand Down
4 changes: 2 additions & 2 deletions vagrant/site.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
roles:
- common

- hosts: master
- hosts: masters
become: yes
become_method: sudo
vars_files:
Expand All @@ -31,7 +31,7 @@
roles:
- nodes

- hosts: master
- hosts: masters
become: yes
become_method: sudo
vars_files:
Expand Down