From a2bda9e5f17d7b05d2cc640338ceab4ab874bca3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?G=C3=BCnther=20Grill?= <guenhter@users.noreply.github.com>
Date: Fri, 3 Nov 2017 08:11:36 +0100
Subject: [PATCH] Eliminate jinja2 template expression warning and rename
coreos-python var (#1911)
* Change deprecated vagrant ansible flag 'sudo' to 'become'
* Emphasize, that the name of the pip_pyton_modules is only considered in coreos
* Remove useless unused variable
* Fix warning when jinja2 template-delimiters used in when statement
There is no need for jinja2 template-delimiters like {{ }} or {% %}
any more. They can just be omitted as described in https://github.com/ansible/ansible/issues/22397
* Fix broken link in getting-started guide
---
docs/getting-started.md | 2 +-
roles/bootstrap-os/defaults/main.yml | 5 ++---
roles/bootstrap-os/tasks/bootstrap-coreos.yml | 2 +-
roles/bootstrap-os/tasks/bootstrap-debian.yml | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/docs/getting-started.md b/docs/getting-started.md
index 67b6132af..e9e6d2f91 100644
--- a/docs/getting-started.md
+++ b/docs/getting-started.md
@@ -75,7 +75,7 @@ kube-apiserver via port 8080. A kubeconfig file is not necessary in this case,
because kubectl will use http://localhost:8080 to connect. The kubeconfig files
generated will point to localhost (on kube-masters) and kube-node hosts will
connect either to a localhost nginx proxy or to a loadbalancer if configured.
-More details on this process are in the [HA guide](ha.md).
+More details on this process are in the [HA guide](ha-mode.md).
Kubespray permits connecting to the cluster remotely on any IP of any
kube-master host on port 6443 by default. However, this requires
diff --git a/roles/bootstrap-os/defaults/main.yml b/roles/bootstrap-os/defaults/main.yml
index 1bc47cf1e..11e45196f 100644
--- a/roles/bootstrap-os/defaults/main.yml
+++ b/roles/bootstrap-os/defaults/main.yml
@@ -1,5 +1,4 @@
---
-pypy_version: 2.4.0
-pip_python_modules:
+pip_python_coreos_modules:
- httplib2
- - six
\ No newline at end of file
+ - six
diff --git a/roles/bootstrap-os/tasks/bootstrap-coreos.yml b/roles/bootstrap-os/tasks/bootstrap-coreos.yml
index cf46b43f9..fc290cef0 100644
--- a/roles/bootstrap-os/tasks/bootstrap-coreos.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-coreos.yml
@@ -51,4 +51,4 @@
- name: Install required python modules
pip:
name: "{{ item }}"
- with_items: "{{pip_python_modules}}"
+ with_items: "{{pip_python_coreos_modules}}"
diff --git a/roles/bootstrap-os/tasks/bootstrap-debian.yml b/roles/bootstrap-os/tasks/bootstrap-debian.yml
index 69511222f..31b64265e 100644
--- a/roles/bootstrap-os/tasks/bootstrap-debian.yml
+++ b/roles/bootstrap-os/tasks/bootstrap-debian.yml
@@ -16,7 +16,7 @@
apt-get update && \
DEBIAN_FRONTEND=noninteractive apt-get install -y python-minimal python-pip dbus
when:
- "{{ need_bootstrap.results | map(attribute='rc') | sort | last | bool }}"
+ need_bootstrap.results | map(attribute='rc') | sort | last | bool
- set_fact:
ansible_python_interpreter: "/usr/bin/python"
--
GitLab