From ea2c9d8f576dcd50e93a4643c564996718afe5b0 Mon Sep 17 00:00:00 2001
From: mlushpenko <iviakciivi@gmail.com>
Date: Thu, 6 Sep 2018 16:26:57 +0200
Subject: [PATCH] Fix yaml checks
---
roles/kubernetes-apps/helm/tasks/main.yml | 2 +-
.../preinstall/tasks/0050-create_directories.yml | 1 +
.../preinstall/tasks/0070-system-packages.yml | 1 +
.../tasks/0080-system-configurations.yml | 1 +
roles/network_plugin/calico/defaults/main.yml | 2 +-
roles/network_plugin/calico/tasks/install.yml | 16 ++++++++--------
6 files changed, 13 insertions(+), 10 deletions(-)
diff --git a/roles/kubernetes-apps/helm/tasks/main.yml b/roles/kubernetes-apps/helm/tasks/main.yml
index da02f9ace..158eff5ca 100644
--- a/roles/kubernetes-apps/helm/tasks/main.yml
+++ b/roles/kubernetes-apps/helm/tasks/main.yml
@@ -39,7 +39,7 @@
register: install_helm
changed_when: false
-#FIXME: https://github.com/helm/helm/issues/4063
+# FIXME: https://github.com/helm/helm/issues/4063
- name: Helm | Force apply tiller overrides if necessary
shell: >
{{ bin_dir }}/helm init --upgrade --tiller-image={{ tiller_image_repo }}:{{ tiller_image_tag }} --tiller-namespace={{ tiller_namespace }}
diff --git a/roles/kubernetes/preinstall/tasks/0050-create_directories.yml b/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
index a91f81eb0..11f8e00d4 100644
--- a/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
+++ b/roles/kubernetes/preinstall/tasks/0050-create_directories.yml
@@ -1,3 +1,4 @@
+---
- name: Create kubernetes directories
file:
path: "{{ item }}"
diff --git a/roles/kubernetes/preinstall/tasks/0070-system-packages.yml b/roles/kubernetes/preinstall/tasks/0070-system-packages.yml
index 2df3a0025..2d1137cbf 100644
--- a/roles/kubernetes/preinstall/tasks/0070-system-packages.yml
+++ b/roles/kubernetes/preinstall/tasks/0070-system-packages.yml
@@ -1,3 +1,4 @@
+---
- name: Update package management cache (YUM)
yum:
update_cache: yes
diff --git a/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml b/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
index 76944cb61..cc74e624a 100644
--- a/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
+++ b/roles/kubernetes/preinstall/tasks/0080-system-configurations.yml
@@ -1,3 +1,4 @@
+---
# Todo : selinux configuration
- name: Confirm selinux deployed
stat:
diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index e9f3c70a7..a1c6f1d22 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -2,7 +2,7 @@
# Enables Internet connectivity from containers
nat_outgoing: true
-#add default ippool name
+# add default ippool name
calico_pool_name: "default-pool"
# Use IP-over-IP encapsulation across hosts
diff --git a/roles/network_plugin/calico/tasks/install.yml b/roles/network_plugin/calico/tasks/install.yml
index 94cbbde5f..4e1f1dc5e 100644
--- a/roles/network_plugin/calico/tasks/install.yml
+++ b/roles/network_plugin/calico/tasks/install.yml
@@ -164,10 +164,10 @@
delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ peers|default([]) }}"
when:
- - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- - not calico_upgrade_enabled
- - peer_with_router|default(false)
- - inventory_hostname in groups['k8s-cluster']
+ - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
+ - not calico_upgrade_enabled
+ - peer_with_router|default(false)
+ - inventory_hostname in groups['k8s-cluster']
- name: Calico | Configure peering with route reflectors
shell: >
@@ -208,10 +208,10 @@
delay: "{{ retry_stagger | random + 3 }}"
with_items: "{{ groups['calico-rr'] | default([]) }}"
when:
- - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
- - not calico_upgrade_enabled
- - peer_with_calico_rr|default(false)
- - hostvars[item]['cluster_id'] == cluster_id
+ - calico_version_on_server.stdout|version_compare('v3.0.0', '<')
+ - not calico_upgrade_enabled
+ - peer_with_calico_rr|default(false)
+ - hostvars[item]['cluster_id'] == cluster_id
- name: Calico | Create calico manifests
--
GitLab