Skip to content

Commit

Permalink
Merge branch 'devel'
Browse files Browse the repository at this point in the history
  • Loading branch information
micafer committed Jan 14, 2016
2 parents af242e1 + 3c3e922 commit ad8a29b
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion contextualization/conf-ansible.yml
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,10 @@
- name: Install libselinux-python in RH
action: yum pkg=libselinux-python state=installed
when: ansible_os_family == "RedHat"

- name: Apt-get update
apt: update_cache=yes
when: ansible_os_family == "Debian"

- name: EPEL
template: src=utils/templates/epel.repo dest=/etc/yum.repos.d/epel.repo
Expand Down Expand Up @@ -82,7 +86,7 @@
when: ansible_os_family == "RedHat" and ansible_distribution_major_version < 6

- name: Disable SELinux
command: /usr/sbin/setenforce 0
selinux: state=disabled
when: ansible_os_family == "RedHat"
ignore_errors: yes

Expand Down

0 comments on commit ad8a29b

Please sign in to comment.