From a65605b17a2e4df685efa0195924972be62ac420 Mon Sep 17 00:00:00 2001
From: MarkusTeufelberger <mteufelberger@mgit.at>
Date: Wed, 24 Apr 2019 07:20:00 +0200
Subject: [PATCH] ansible-lint: Don't use bare variables (#4608)

Circumvented one false positive from ansible-lint
Moved a block of jinja magic into its own variable
---
 .ansible-lint                                       | 1 -
 roles/etcd/tasks/check_certs.yml                    | 6 +++---
 roles/kubernetes/preinstall/tasks/0090-etchosts.yml | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/.ansible-lint b/.ansible-lint
index d622584ae..356de88a2 100644
--- a/.ansible-lint
+++ b/.ansible-lint
@@ -4,7 +4,6 @@ skip_list:
   # see https://docs.ansible.com/ansible-lint/rules/default_rules.html for a list of all default rules
   # The following rules throw errors.
   # These either still need to be corrected in the repository and the rules re-enabled or they are skipped on purpose.
-  - '104'
   - '201'
   - '204'
   - '206'
diff --git a/roles/etcd/tasks/check_certs.yml b/roles/etcd/tasks/check_certs.yml
index 76d46c93a..b11a2e9e4 100644
--- a/roles/etcd/tasks/check_certs.yml
+++ b/roles/etcd/tasks/check_certs.yml
@@ -22,13 +22,14 @@
     - ca.pem
     - node-{{ inventory_hostname }}-key.pem
 
-
 - name: "Check_certs | Set 'gen_certs' to true"
   set_fact:
     gen_certs: true
   when: not item in etcdcert_master.files|map(attribute='path') | list
   run_once: true
-  with_items: >-
+  with_items: "{{ expected_files }}"
+  vars:
+    expected_files: >-
        ['{{etcd_cert_dir}}/ca.pem',
        {% set all_etcd_hosts = groups['k8s-cluster']|union(groups['etcd'])|union(groups['calico-rr']|default([]))|unique|sort %}
        {% for host in all_etcd_hosts %}
@@ -36,7 +37,6 @@
        {% if not loop.last %}{{','}}{% endif %}
        {% endfor %}]
 
-
 - name: "Check_certs | Set 'gen_node_certs' to true"
   set_fact:
     gen_node_certs: |-
diff --git a/roles/kubernetes/preinstall/tasks/0090-etchosts.yml b/roles/kubernetes/preinstall/tasks/0090-etchosts.yml
index 7979568c8..02fc3c420 100644
--- a/roles/kubernetes/preinstall/tasks/0090-etchosts.yml
+++ b/roles/kubernetes/preinstall/tasks/0090-etchosts.yml
@@ -38,7 +38,7 @@
     etc_hosts_localhosts_dict: >-
        {%- set splitted = (item | regex_replace('[ \t]+', ' ')|regex_replace('#.*$')|trim).split( ' ') -%}
        {{ etc_hosts_localhosts_dict|default({}) | combine({splitted[0]: splitted[1::] }) }}
-  with_items: "{{ (etc_hosts_content['content'] | b64decode).split('\n') }}"
+  with_items: "{{ (etc_hosts_content['content'] | b64decode).splitlines() }}"
   when:
     - etc_hosts_content.content is defined
     - (item is match('^::1 .*') or item is match('^127.0.0.1 .*'))