Skip to content

Commit 8f4e294

Browse files
committed
fail on old and remove more includes
1 parent 6192fab commit 8f4e294

File tree

7 files changed

+16
-13
lines changed

7 files changed

+16
-13
lines changed

CHANGELOG.md

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,3 +26,8 @@
2626
# v1.0.5
2727

2828
- Remove unnecessary include
29+
30+
# v1.0.6
31+
32+
- Add fail on old distro versions
33+
- Remove all distro specific includes

tasks/CentOS.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
# File: tasks/CentOS.yml - CentOS tasks for Vault
33

4-
- name: "Distribution specific variables"
5-
include_vars: main.yml
6-
74
- name: OS packages
85
yum: "name={{ item }} state=present"
96
with_items: "{{ vault_centos_os_packages }}"

tasks/Debian.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
# File: tasks/Debian.yml - Debian tasks for Vault
33

4-
- name: "Distribution specific variables"
5-
include_vars: main.yml
6-
74
- name: OS packages
85
apt: "name={{ item }} state=present update_cache=yes"
96
with_items: "{{ vault_debian_os_packages }}"

tasks/RedHat.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
# File: tasks/Red Hat.yml - Red Hat tasks for Vault
33

4-
- name: "Distribution specific variables"
5-
include_vars: main.yml
6-
74
- name: OS packages
85
yum: "name={{ item }} state=present"
96
with_items: "{{ vault_redhat_os_packages }}"

tasks/Ubuntu.yml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,6 @@
11
---
22
# File: tasks/Ubuntu.yml - Ubuntu tasks for Vault
33

4-
- name: "Distribution specific variables"
5-
include_vars: main.yml
6-
74
- name: OS packages
85
apt: "name={{ item }} state=present update_cache=yes"
96
with_items: "{{ vault_ubuntu_os_packages }}"

tasks/main.yml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,16 @@
11
---
22
# File: tasks/main.yml - Main tasks for Vault
33

4+
- name: Fail if not a new release of Ubuntu
5+
fail:
6+
msg: "{{ ansible_distribution_version }} is not an acceptable version of Ubuntu for this role"
7+
when: ansible_lsb.id|lower == "ubuntu" and ( ansible_distribution_version|version_compare(12.04, '<') or ansible_distribution_version|version_compare(12.10, '=') )
8+
9+
- name: Fail if not a new release of Debian
10+
fail:
11+
msg: "{{ ansible_distribution_version }} is not an acceptable version of Debian for this role"
12+
when: ansible_lsb.id|lower == "debian" and ansible_distribution_version|version_compare(8.5, '<')
13+
414
- name: Create cluster groupings
515
group_by: key=os_{{ ansible_os_family }}
616

version.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
v1.0.5
1+
v1.0.6

0 commit comments

Comments
 (0)