From a4e65c7ceb9dddb55120c44e44ff69a0ec97473f Mon Sep 17 00:00:00 2001 From: Maxime Guyot Date: Tue, 9 Apr 2019 13:21:07 +0200 Subject: [PATCH] Upgrade to Ansible >2.7.0 (#4471) --- README.md | 6 +----- cluster.yml | 7 +++---- remove-node.yml | 7 +++---- requirements.txt | 2 +- reset.yml | 7 +++---- scale.yml | 7 +++---- upgrade-cluster.yml | 7 +++---- 7 files changed, 17 insertions(+), 26 deletions(-) diff --git a/README.md b/README.md index 4693b1d69..eddd50216 100644 --- a/README.md +++ b/README.md @@ -19,10 +19,6 @@ To deploy the cluster you can use : ### Ansible -#### Ansible version - -Ansible v2.7.0 is failing and/or produce unexpected results due to [ansible/ansible/issues/46600](https://github.com/ansible/ansible/issues/46600) - #### Usage # Install dependencies from ``requirements.txt`` @@ -142,7 +138,7 @@ plugins can be deployed for a given single cluster. Requirements ------------ -- **Ansible v2.6 (or newer) and python-netaddr is installed on the machine +- **Ansible v2.7.6 (or newer) and python-netaddr is installed on the machine that will run Ansible commands** - **Jinja 2.9 (or newer) is required to run the Ansible Playbooks** - The target servers must have **access to the Internet** in order to pull docker images. Otherwise, additional configuration is required (See [Offline Environment](https://github.com/kubernetes-sigs/kubespray/blob/master/docs/downloads.md#offline-environment)) diff --git a/cluster.yml b/cluster.yml index e0317758b..3cc88fd53 100644 --- a/cluster.yml +++ b/cluster.yml @@ -3,12 +3,11 @@ gather_facts: false become: no tasks: - - name: "Check ansible version !=2.7.0" + - name: "Check ansible version >=2.7.6" assert: - msg: "Ansible V2.7.0 can't be used until: https://github.com/ansible/ansible/issues/46600 is fixed" + msg: "Ansible must be v2.7.6 or higher" that: - - ansible_version.string is version("2.7.0", "!=") - - ansible_version.string is version("2.6.0", ">=") + - ansible_version.string is version("2.7.6", ">=") tags: - check vars: diff --git a/remove-node.yml b/remove-node.yml index 381a0a8e5..026363c7d 100644 --- a/remove-node.yml +++ b/remove-node.yml @@ -2,12 +2,11 @@ - hosts: localhost become: no tasks: - - name: "Check ansible version !=2.7.0" + - name: "Check ansible version >=2.7.6" assert: - msg: "Ansible V2.7.0 can't be used until: https://github.com/ansible/ansible/issues/46600 is fixed" + msg: "Ansible must be v2.7.6 or higher" that: - - ansible_version.string is version("2.7.0", "!=") - - ansible_version.string is version("2.6.0", ">=") + - ansible_version.string is version("2.7.6", ">=") tags: - check vars: diff --git a/requirements.txt b/requirements.txt index 8979111d7..fcb79366f 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,4 +1,4 @@ -ansible>=2.6.0,!=2.7.0 +ansible>=2.7.6 jinja2>=2.9.6 netaddr pbr>=1.6 diff --git a/reset.yml b/reset.yml index 4cac93997..e67cb72a0 100644 --- a/reset.yml +++ b/reset.yml @@ -2,12 +2,11 @@ - hosts: localhost become: no tasks: - - name: "Check ansible version !=2.7.0" + - name: "Check ansible version >=2.7.6" assert: - msg: "Ansible V2.7.0 can't be used until: https://github.com/ansible/ansible/issues/46600 is fixed" + msg: "Ansible must be v2.7.6 or higher" that: - - ansible_version.string is version("2.7.0", "!=") - - ansible_version.string is version("2.6.0", ">=") + - ansible_version.string is version("2.7.6", ">=") tags: - check vars: diff --git a/scale.yml b/scale.yml index 9809eb068..967f79042 100644 --- a/scale.yml +++ b/scale.yml @@ -3,12 +3,11 @@ gather_facts: False become: no tasks: - - name: "Check ansible version !=2.7.0" + - name: "Check ansible version >=2.7.6" assert: - msg: "Ansible V2.7.0 can't be used until: https://github.com/ansible/ansible/issues/46600 is fixed" + msg: "Ansible must be v2.7.6 or higher" that: - - ansible_version.string is version("2.7.0", "!=") - - ansible_version.string is version("2.6.0", ">=") + - ansible_version.string is version("2.7.6", ">=") tags: - check vars: diff --git a/upgrade-cluster.yml b/upgrade-cluster.yml index 20b33d21f..f895c1f9d 100644 --- a/upgrade-cluster.yml +++ b/upgrade-cluster.yml @@ -3,12 +3,11 @@ gather_facts: false become: no tasks: - - name: "Check ansible version !=2.7.0" + - name: "Check ansible version >=2.7.6" assert: - msg: "Ansible V2.7.0 can't be used until: https://github.com/ansible/ansible/issues/46600 is fixed" + msg: "Ansible must be v2.7.6 or higher" that: - - ansible_version.string is version("2.7.0", "!=") - - ansible_version.string is version("2.6.0", ">=") + - ansible_version.string is version("2.7.6", ">=") tags: - check vars: