From 571d5cb33c23dab3576e10a0005dd494d57a173b Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 15 Jan 2019 11:47:05 +0100 Subject: [PATCH 1/3] vagrant/ansible: rename group "master" to "masters" Ansible complains about the following: [WARNING]: Found both group and host with same name: master As the hostname is "master", rename the group to "masters" (with "s", even though there is only one). Signed-off-by: Niels de Vos --- vagrant/Vagrantfile | 2 +- vagrant/gcr_proxy.yml | 2 +- vagrant/site.yml | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vagrant/Vagrantfile b/vagrant/Vagrantfile index 830c6101..174ca6de 100644 --- a/vagrant/Vagrantfile +++ b/vagrant/Vagrantfile @@ -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 = { diff --git a/vagrant/gcr_proxy.yml b/vagrant/gcr_proxy.yml index 930fccc1..30875728 100644 --- a/vagrant/gcr_proxy.yml +++ b/vagrant/gcr_proxy.yml @@ -1,4 +1,4 @@ -- hosts: master +- hosts: masters become: yes become_method: sudo vars_files: diff --git a/vagrant/site.yml b/vagrant/site.yml index a78bc8b7..56612d62 100644 --- a/vagrant/site.yml +++ b/vagrant/site.yml @@ -15,7 +15,7 @@ roles: - common -- hosts: master +- hosts: masters become: yes become_method: sudo vars_files: @@ -31,7 +31,7 @@ roles: - nodes -- hosts: master +- hosts: masters become: yes become_method: sudo vars_files: From 932646e87cd58aecb5fa958f9d85e304e4157efe Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 15 Jan 2019 11:49:59 +0100 Subject: [PATCH 2/3] vagrant/ansible: use 'include_tasks' instead of 'include' Ansible complains that 'include' is deprecated: [DEPRECATION WARNING]: The use of 'include' for tasks has been deprecated. Use 'import_tasks' for static inclusions or 'include_tasks' for dynamic inclusions. This feature will be removed in a future release. Deprecation warnings can be disabled by setting deprecation_warnings=False in ansible.cfg. Instead of 'include', use 'include_tasks'. Signed-off-by: Niels de Vos --- vagrant/roles/master/tasks/main.yml | 2 +- vagrant/roles/nodes/tasks/main.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/vagrant/roles/master/tasks/main.yml b/vagrant/roles/master/tasks/main.yml index bedd28e4..48dabc0a 100644 --- a/vagrant/roles/master/tasks/main.yml +++ b/vagrant/roles/master/tasks/main.yml @@ -1,4 +1,4 @@ -- include: gcr_proxy.yml +- include_tasks: gcr_proxy.yml when: - custom_registry is defined - custom_registry_gcr | default(false) diff --git a/vagrant/roles/nodes/tasks/main.yml b/vagrant/roles/nodes/tasks/main.yml index b6584a2e..f6307921 100644 --- a/vagrant/roles/nodes/tasks/main.yml +++ b/vagrant/roles/nodes/tasks/main.yml @@ -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) From 754662ad2ebfda7c13025dde86e62a2e1587e4f1 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 15 Jan 2019 12:49:35 +0100 Subject: [PATCH 3/3] vagrant/ansible: do not use filter, but "is" Ansible complains that checking the return value of a filter action is deprecated. It seems required to use "is" instead of the pipe ("|"). [DEPRECATION WARNING]: Using tests as filters is deprecated. Instead of using `result|version_compare` use `result is version_compare`. This feature will be removed in version 2.9. Deprecation warnings can be disabled by setting deprecation_warnings=False in ansible.cfg. Signed-off-by: Niels de Vos --- vagrant/gcr_proxy.yml | 4 ++-- vagrant/roles/common/tasks/main.yml | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/vagrant/gcr_proxy.yml b/vagrant/gcr_proxy.yml index 30875728..38869993 100644 --- a/vagrant/gcr_proxy.yml +++ b/vagrant/gcr_proxy.yml @@ -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 @@ -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) diff --git a/vagrant/roles/common/tasks/main.yml b/vagrant/roles/common/tasks/main.yml index f0926eec..1e93f04e 100644 --- a/vagrant/roles/common/tasks/main.yml +++ b/vagrant/roles/common/tasks/main.yml @@ -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