Merge pull request #59 from hardening-io/ansible_2.0

Ansible 2.0 support

Author: chris-rock

.kitchen.yml

@@ -49,10 +49,17 @@ platforms:
 verifier:
   name: inspec
 suites:
-- name: default
+- name: ansible_1.9
+  hosts: all
+  ansible_verbose: true
+  ansible_diff: true
+  roles_path: ../ansible-os-hardening/
+  provisioner:
+    playbook: test/integration/playbooks/default.yml
+    ansible_version: 1.9.4
+- name: ansible_latest
   hosts: all
   ansible_verbose: true
-  ansible_version: 1.9.2
   ansible_diff: true
   roles_path: ../ansible-os-hardening/
   provisioner:

.travis.yml

@@ -3,11 +3,16 @@ notifications:
   webhooks: https://galaxy.ansible.com/api/v1/notifications/
 language: python
 python: "2.7"
+
+env:
+  - ANSIBLE_VERSION=latest
+  - ANSIBLE_VERSION=1.9.4
+
 before_install:
  - sudo apt-get update -qq
  - sudo apt-get install -qq python-apt python-pycurl
 install:
-  - pip install ansible
+  - if [ "$ANSIBLE_VERSION" = "latest" ]; then pip install ansible; else pip install ansible==$ANSIBLE_VERSION; fi
   - echo -e 'localhost ansible_connection=local' > spec/inventory
   - echo -e '[defaults]\nroles_path = ../\nhostfile = ./spec/inventory' > ansible.cfg
 

meta/main.yml

@@ -1,7 +1,7 @@
 ---
 galaxy_info:
   author: "Sebastian Gumprich"
-  description: ' This Ansible playbook provides numerous security-related configurations, providing all-round base protection.'
+  description: 'This Ansible playbook provides numerous security-related configurations, providing all-round base protection.'
   company: Hardening Framework Team
   license: Apache License 2.0
   min_ansible_version: '1.9'