Skip to content

Commit

Permalink
Upgrade to Ansible >2.7.0 (#4471)
Browse files Browse the repository at this point in the history
  • Loading branch information
Miouge1 authored and k8s-ci-robot committed Apr 9, 2019
1 parent 20ebb49 commit a4e65c7
Show file tree
Hide file tree
Showing 7 changed files with 17 additions and 26 deletions.
6 changes: 1 addition & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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``
Expand Down Expand Up @@ -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))
Expand Down
7 changes: 3 additions & 4 deletions cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 3 additions & 4 deletions remove-node.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
ansible>=2.6.0,!=2.7.0
ansible>=2.7.6
jinja2>=2.9.6
netaddr
pbr>=1.6
Expand Down
7 changes: 3 additions & 4 deletions reset.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 3 additions & 4 deletions scale.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
7 changes: 3 additions & 4 deletions upgrade-cluster.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down

0 comments on commit a4e65c7

Please sign in to comment.