Skip to content

Commit

Permalink
Skip sysctl-tasks in travis-environment
Browse files Browse the repository at this point in the history
  • Loading branch information
Sebastian Gumprich authored and chris-rock committed Jun 17, 2015
1 parent be4a3d1 commit 531a051
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 21 deletions.
3 changes: 1 addition & 2 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,7 @@ install:
- pip install ansible
- echo -e 'localhost ansible_connection=local' > spec/inventory
- echo -e '[defaults]\nroles_path = ./roles\nhostfile = ./spec/inventory' > ansible.cfg
- echo -e 'hash_behaviour=merge' >> ansible.cfg

script:
- ansible-playbook --syntax-check spec/travis.yml
- ansible-playbook --sudo -v --diff spec/travis.yml --extra-vars "@spec/travis_exceptions.json"
- ansible-playbook --sudo -v --diff spec/travis.yml --skip-tags "sysctl"
19 changes: 10 additions & 9 deletions roles/ansible-os-hardening/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
---
- name: add the OS specific variables
include_vars: "{{ ansible_os_family }}.yml"
tags: always

- include: limits.yml
- include: login_defs.yml
- include: minimize_access.yml
- include: pam.yml
- include: profile.yml
- include: securetty.yml
- include: suid_sgid.yml
- include: sysctl.yml
- include: limits.yml tags=limits
- include: login_defs.yml tags=login_defs
- include: minimize_access.yml tags=minimize_acces
- include: pam.yml tags=pam
- include: profile.yml tags=profile
- include: securetty.yml tags=securetty
- include: suid_sgid.yml tags=suid_sgid
- include: sysctl.yml tags=sysctl

- include: yum.yml
- include: yum.yml tags=yum
when: ansible_os_family == 'RedHat' or ansible_os_family == 'Oracle Linux'
10 changes: 0 additions & 10 deletions spec/travis_exceptions.json

This file was deleted.

0 comments on commit 531a051

Please sign in to comment.