diff --git a/.gitignore b/.gitignore index 69260444..e6c493b8 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,6 @@ .tm_properties *.retry examples/hosts +files/*.zip +files/vault + diff --git a/CHANGELOG.md b/CHANGELOG.md index 46465e98..32a36cf4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -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 diff --git a/examples/README_VAGRANT.md b/examples/README_VAGRANT.md index fbdd76d7..8c9f9595 100644 --- a/examples/README_VAGRANT.md +++ b/examples/README_VAGRANT.md @@ -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 diff --git a/tasks/main.yml b/tasks/main.yml index 0bb825f7..9c7ce7d2 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -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 }} diff --git a/templates/vault_sysvinit.j2 b/templates/vault_sysvinit.j2 index 32b13cc9..6a73d7a5 100644 --- a/templates/vault_sysvinit.j2 +++ b/templates/vault_sysvinit.j2 @@ -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 diff --git a/version.txt b/version.txt index 14b34a47..7c46aa19 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -v1.0.8 +v1.0.11