mirror of https://github.com/ceph/ceph-ansible.git
move selinux check to `ceph-defaults`
This check is alone in `ceph-docker-common` since a previous code refactor. Moving this check in `ceph-defaults` allows us to run `ceph-clients` without having to run `ceph-docker-common` even in non-containerized deployment. Signed-off-by: Guillaume Abrioux <gabrioux@redhat.com>pull/2494/head
parent
f3caee8460
commit
cf27c5e941
|
@ -192,3 +192,11 @@
|
||||||
when:
|
when:
|
||||||
- containerized_deployment
|
- containerized_deployment
|
||||||
- ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
|
- ceph_docker_image_tag | search("centos") or ceph_docker_image | search("rhceph") or ceph_docker_image_tag | search("fedora")
|
||||||
|
|
||||||
|
- name: check if selinux is enabled
|
||||||
|
command: getenforce
|
||||||
|
register: sestatus
|
||||||
|
changed_when: false
|
||||||
|
check_mode: no
|
||||||
|
when:
|
||||||
|
- ansible_os_family == 'RedHat'
|
||||||
|
|
|
@ -98,8 +98,3 @@
|
||||||
# # because it creates the directories needed by the latter.
|
# # because it creates the directories needed by the latter.
|
||||||
- name: include dirs_permissions.yml
|
- name: include dirs_permissions.yml
|
||||||
include: dirs_permissions.yml
|
include: dirs_permissions.yml
|
||||||
|
|
||||||
- name: include selinux.yml
|
|
||||||
include: selinux.yml
|
|
||||||
when:
|
|
||||||
- ansible_os_family == 'RedHat'
|
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
---
|
|
||||||
- name: check if selinux is enabled
|
|
||||||
command: getenforce
|
|
||||||
register: sestatus
|
|
||||||
changed_when: false
|
|
||||||
check_mode: no
|
|
Loading…
Reference in New Issue