Merge pull request #6 from Oefenweb/added-rhel-7-support

Added RHEL 7 support

.travis.yml

@@ -4,6 +4,8 @@ python: "2.7"
 
 env:
   - ANSIBLE_VERSION=latest
+  - ANSIBLE_VERSION=1.9.3
+  - ANSIBLE_VERSION=1.9.2
   - ANSIBLE_VERSION=1.9.1
   - ANSIBLE_VERSION=1.9.0.1
   - ANSIBLE_VERSION=1.8.4
@@ -57,9 +59,6 @@ install:
   # Install Ansible.
   - if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install ansible==$ANSIBLE_VERSION; fi
 
-  # Add ansible.cfg to pick up roles path.
-  - printf "[defaults]\nroles_path = ../" > ansible.cfg
-
 script:
   # Check the role/playbook's syntax.
   - ansible-playbook -i tests/inventory tests/test.yml --syntax-check

README.md

@@ -47,7 +47,7 @@ None
 ---
 - hosts: all
   roles:
-  - keepalived
+    - keepalived
 ```
 
 ##### HAProxy

Vagrantfile

@@ -3,8 +3,6 @@
 
 role = File.basename(File.expand_path(File.dirname(__FILE__)))
 
-File.open(File.dirname(__FILE__) + '/ansible.cfg', 'w') { |f| f.write("[defaults]\nroles_path = ../") }
-
 boxes = [
   {
     :name => "ubuntu-1004",

meta/main.yml

@@ -7,13 +7,16 @@ galaxy_info:
   license: MIT
   min_ansible_version: 1.4
   platforms:
-  - name: Ubuntu
-    versions:
-    - lucid
-    - precise
-    - trusty
+    - name: Ubuntu
+      versions:
+        - lucid
+        - precise
+        - trusty
+    - name: EL
+      versions:
+        - 7
   categories:
-  - system
-  - networking
-  - clustering
+    - system
+    - networking
+    - clustering
 dependencies: []

tasks/main.yml

@@ -1,12 +1,31 @@
 # tasks file for keepalived
 ---
-- name: install package
+- name: install dependencies
+  yum:
+    name: "{{ item }}"
+    state: present
+    update_cache: true
+  with_items: keepalived_dependencies
+  when: ansible_os_family == 'RedHat'
+  tags:
+    - configuration
+    - keepalived
+    - keepalived-install
+    - keepalived-install-redhat
+
+- name: install dependencies
   apt:
-    name: keepalived
+    name: "{{ item }}"
     state: latest
     update_cache: true
     cache_valid_time: 3600
-  tags: [configuration, keepalived, keepalived-install]
+  with_items: keepalived_dependencies
+  when: ansible_os_family == 'Debian'
+  tags:
+    - configuration
+    - keepalived
+    - keepalived-install
+    - keepalived-install-debian
 
 - name: update configuration file
   template:
@@ -16,7 +35,10 @@
     group: root
     mode: 0640
   notify: restart keepalived
-  tags: [configuration, keepalived, keepalived-configuration]
+  tags:
+    - configuration
+    - keepalived
+    - keepalived-configuration
 
 - name: allow binding non-local IP
   sysctl:
@@ -25,7 +47,10 @@
     state: present
   notify: reload sysctl
   when: keepalived_ip_nonlocal_bind != false
-  tags: [configuration, keepalived, keepalived-ip-nonlocal-bind]
+  tags:
+    - configuration
+    - keepalived
+    - keepalived-ip-nonlocal-bind
 
 - name: start and enable service
   service:
@@ -34,4 +59,7 @@
     enabled: yes
     # Pattern is needed to fix failure in Ubuntu 10.04 and idempotency in 12.04 and 14.04
     pattern: /usr/sbin/keepalived
-  tags: [configuration, keepalived, keepalived-start-enable-service]
+  tags:
+    - configuration
+    - keepalived
+    - keepalived-start-enable-service

tests/test.yml

@@ -3,7 +3,7 @@
 - hosts: localhost
   remote_user: root
   roles:
-    - ansible-keepalived
+    - ../../
   vars:
     # Do not try to set net.ipv4.ip_nonlocal_bind, which fails on travis-ci
     keepalived_ip_nonlocal_bind: false

tests/vagrant.yml

@@ -4,7 +4,7 @@
   remote_user: vagrant
   sudo: true
   roles:
-    - keepalived
+    - ../../
   vars:
     keepalived_vrrp_scripts:
       chk_haproxy:

vars/main.yml

@@ -1,2 +1,4 @@
 # vars file for keepalived
 ---
+keepalived_dependencies:
+  - keepalived