From 8f4e2943fac15ca796f38ea5307f3f30a0880b97 Mon Sep 17 00:00:00 2001 From: Brian Shumate Date: Sat, 22 Oct 2016 12:27:34 -0400 Subject: [PATCH] fail on old and remove more includes --- CHANGELOG.md | 5 +++++ tasks/CentOS.yml | 3 --- tasks/Debian.yml | 3 --- tasks/RedHat.yml | 3 --- tasks/Ubuntu.yml | 3 --- tasks/main.yml | 10 ++++++++++ version.txt | 2 +- 7 files changed, 16 insertions(+), 13 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 31cc0dd2..0ab3cbed 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -26,3 +26,8 @@ # v1.0.5 - Remove unnecessary include + +# v1.0.6 + +- Add fail on old distro versions +- Remove all distro specific includes diff --git a/tasks/CentOS.yml b/tasks/CentOS.yml index 0d84d75b..de27e577 100644 --- a/tasks/CentOS.yml +++ b/tasks/CentOS.yml @@ -1,9 +1,6 @@ --- # File: tasks/CentOS.yml - CentOS tasks for Vault -- name: "Distribution specific variables" - include_vars: main.yml - - name: OS packages yum: "name={{ item }} state=present" with_items: "{{ vault_centos_os_packages }}" diff --git a/tasks/Debian.yml b/tasks/Debian.yml index 689f3414..80dfa42e 100644 --- a/tasks/Debian.yml +++ b/tasks/Debian.yml @@ -1,9 +1,6 @@ --- # File: tasks/Debian.yml - Debian tasks for Vault -- name: "Distribution specific variables" - include_vars: main.yml - - name: OS packages apt: "name={{ item }} state=present update_cache=yes" with_items: "{{ vault_debian_os_packages }}" diff --git a/tasks/RedHat.yml b/tasks/RedHat.yml index 679a39d7..42047081 100644 --- a/tasks/RedHat.yml +++ b/tasks/RedHat.yml @@ -1,9 +1,6 @@ --- # File: tasks/Red Hat.yml - Red Hat tasks for Vault -- name: "Distribution specific variables" - include_vars: main.yml - - name: OS packages yum: "name={{ item }} state=present" with_items: "{{ vault_redhat_os_packages }}" diff --git a/tasks/Ubuntu.yml b/tasks/Ubuntu.yml index b11e7144..9c2b9ed2 100644 --- a/tasks/Ubuntu.yml +++ b/tasks/Ubuntu.yml @@ -1,9 +1,6 @@ --- # File: tasks/Ubuntu.yml - Ubuntu tasks for Vault -- name: "Distribution specific variables" - include_vars: main.yml - - name: OS packages apt: "name={{ item }} state=present update_cache=yes" with_items: "{{ vault_ubuntu_os_packages }}" diff --git a/tasks/main.yml b/tasks/main.yml index 8b87a354..0bb825f7 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,6 +1,16 @@ --- # File: tasks/main.yml - Main tasks for Vault +- name: Fail if not a new release of Ubuntu + fail: + msg: "{{ ansible_distribution_version }} is not an acceptable version of Ubuntu for this role" + when: ansible_lsb.id|lower == "ubuntu" and ( ansible_distribution_version|version_compare(12.04, '<') or ansible_distribution_version|version_compare(12.10, '=') ) + +- name: Fail if not a new release of Debian + fail: + msg: "{{ ansible_distribution_version }} is not an acceptable version of Debian for this role" + when: ansible_lsb.id|lower == "debian" and ansible_distribution_version|version_compare(8.5, '<') + - name: Create cluster groupings group_by: key=os_{{ ansible_os_family }} diff --git a/version.txt b/version.txt index 80e0d762..e8763988 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v1.0.5 +v1.0.6