CentOS updates

- Update/validate CentOS 7 box - Update documentation - Updated failure cases for CentOS
ansible-collections · Oct 29, 2016 · f7ee9db · f7ee9db
1 parent 866f2fc
commit f7ee9db
Show file tree

Hide file tree

Showing 4 changed files with 22 additions and 6 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -211,3 +211,9 @@
 # v1.3.2
 
 - Correct CONSUL_DNSMASQ_ENABLE var name
+
+## v1.3.3
+
+- Update/validate CentOS 7 box
+- Update documentation
+- Updated failure cases for CentOS
diff --git a/examples/README_VAGRANT.md b/examples/README_VAGRANT.md
@@ -89,7 +89,7 @@ prefer, it 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
@@ -1,15 +1,25 @@
 ---
 # File: tasks/main.yml - Main tasks for Consul
 
-- 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={{ consul_node_role }}"

diff --git a/version.txt b/version.txt
@@ -1 +1 @@
-v1.3.2
+v1.3.3