Fix up warnings and deprecations (#1848)

This commit is contained in:
Matthew Mosesohn 2017-10-20 08:25:57 +01:00 committed by GitHub
parent 514359e556
commit 0b4fcc83bd
4 changed files with 6 additions and 10 deletions

View file

@ -11,10 +11,6 @@
- include: bootstrap-centos.yml - include: bootstrap-centos.yml
when: bootstrap_os == "centos" when: bootstrap_os == "centos"
- task:
debug:
msg: "bootstrap_os: {{ bootstrap_os|d('') }}"
- include: setup-pipelining.yml - include: setup-pipelining.yml
- name: check if atomic host - name: check if atomic host

View file

@ -26,7 +26,7 @@
- name: "Check_certs | Set 'gen_certs' to true" - name: "Check_certs | Set 'gen_certs' to true"
set_fact: set_fact:
gen_certs: true gen_certs: true
when: "not '{{ item }}' in etcdcert_master.files|map(attribute='path') | list" when: not item in etcdcert_master.files|map(attribute='path') | list
run_once: true run_once: true
with_items: >- with_items: >-
['{{etcd_cert_dir}}/ca.pem', ['{{etcd_cert_dir}}/ca.pem',

View file

@ -41,10 +41,10 @@
- kubectl - kubectl
- upgrade - upgrade
- task: Include kubeadm setup if enabled - name: Include kubeadm setup if enabled
include: kubeadm-setup.yml include: kubeadm-setup.yml
when: kubeadm_enabled|bool|default(false) when: kubeadm_enabled|bool|default(false)
- task: Include static pod setup if not using kubeadm - name: Include static pod setup if not using kubeadm
include: static-pod-setup.yml include: static-pod-setup.yml
when: not kubeadm_enabled|bool|default(false) when: not kubeadm_enabled|bool|default(false)

View file

@ -30,8 +30,8 @@
- name: "Stop if known booleans are set as strings (Use JSON format on CLI: -e \"{'key': true }\")" - name: "Stop if known booleans are set as strings (Use JSON format on CLI: -e \"{'key': true }\")"
assert: assert:
that: hostvars[inventory_hostname][item]|type_debug == 'bool' that: vars[item]|type_debug == 'bool'
msg: "{{hostvars[inventory_hostname][item]}} isn't a bool" msg: "{{vars[item]}} isn't a bool"
run_once: yes run_once: yes
with_items: with_items:
- kubeadm_enabled - kubeadm_enabled
@ -40,7 +40,7 @@
- download_always_pull - download_always_pull
- efk_enabled - efk_enabled
- helm_enabled - helm_enabled
- openstack_lbaas_Enabled - openstack_lbaas_enabled
- rbac_enabled - rbac_enabled
ignore_errors: "{{ ignore_assert_errors }}" ignore_errors: "{{ ignore_assert_errors }}"