Skip to content

Commit

Permalink
CentOS updates
Browse files Browse the repository at this point in the history
- Update/validate CentOS 7 box
- Update documentation
- Update failure cases for CentOS
- Fix SysV init script
  • Loading branch information
brianshumate committed Oct 29, 2016
1 parent 5203285 commit 2179a08
Show file tree
Hide file tree
Showing 6 changed files with 27 additions and 7 deletions.
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -3,3 +3,6 @@
.tm_properties
*.retry
examples/hosts
files/*.zip
files/vault

7 changes: 7 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -47,3 +47,10 @@
## v1.0.10

- Fix binary name

## v1.0.11

- Update/validate CentOS 7 box
- Update documentation
- Update failure cases for CentOS
- Fix SysV init script
2 changes: 1 addition & 1 deletion examples/README_VAGRANT.md
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ can also install CentOS 7 based nodes by changing the command in step 4 to
the following:

```
BOX_NAME="chef/centos-7.0" vagrant up
BOX_NAME="centos/7" vagrant up
```

## Notes
Expand Down
18 changes: 14 additions & 4 deletions tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,25 @@
---
# File: tasks/main.yml - Main tasks for Vault

- name: Fail if not a new release of Ubuntu
- name: Fail if not a new release of CentOS
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, '=') )
msg: "{{ ansible_distribution_version }} is not an acceptable version of Debian for this role"
when: ansible_distribution == "CentOS" and ansible_distribution_version|version_compare(7, '<')

- 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, '<')
when: ansible_distribution == "Debian" and ansible_distribution_version|version_compare(8.5, '<')

- name: Fail if not a new release of Red Hat
fail:
msg: "{{ ansible_distribution_version }} is not an acceptable version of Debian for this role"
when: ansible_distribution == "RedHat" and ansible_distribution_version|version_compare(7, '<')

- 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_distribution == "Ubuntu" and ( ansible_distribution_version|version_compare(12.04, '<') or ansible_distribution_version|version_compare(12.10, '=') )

- name: Create cluster groupings
group_by: key=os_{{ ansible_os_family }}
Expand Down
2 changes: 1 addition & 1 deletion templates/vault_sysvinit.j2
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
{% endif %}

VAULT=/usr/local/bin/vault
CONFIG=/etc/vault.d/{{ vault_node_role }}
CONFIG=/etc/vault.d
PID_FILE=/var/run/vault/vault.pid

[ -e /etc/sysconfig/vault ] && . /etc/sysconfig/vault
Expand Down
2 changes: 1 addition & 1 deletion version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v1.0.8
v1.0.11

0 comments on commit 2179a08

Please sign in to comment.