diff options
| author | Michael DeHaan <michael.dehaan@gmail.com> | 2013-09-06 18:08:40 -0700 |
|---|---|---|
| committer | Michael DeHaan <michael.dehaan@gmail.com> | 2013-09-06 18:08:40 -0700 |
| commit | f1eb5b45d99c9f139ba3ab7ec6a0801f43452ee9 (patch) | |
| tree | 44232bc25cd5f92d115ca52a7bcb5e614bcae215 | |
| parent | 2c27aa63e0f631f019ac394eea2065ad19fcabbc (diff) | |
| parent | 546788a1b637369b41dfb231e9accc7c00246fc3 (diff) | |
| download | ansible-f1eb5b45d99c9f139ba3ab7ec6a0801f43452ee9.tar.gz | |
Merge pull request #4056 from jlaska/libselinux-doc
The required package for selinux is libselinux-python
| -rw-r--r-- | docsite/latest/rst/gettingstarted.rst | 2 | ||||
| -rw-r--r-- | lib/ansible/module_common.py | 2 | ||||
| -rw-r--r-- | library/system/selinux | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/docsite/latest/rst/gettingstarted.rst b/docsite/latest/rst/gettingstarted.rst index 8197430f92..ff83caf160 100644 --- a/docsite/latest/rst/gettingstarted.rst +++ b/docsite/latest/rst/gettingstarted.rst @@ -40,7 +40,7 @@ also need: .. note:: If you have SELinux enabled on remote nodes, you will also want to install - python-selinux on them before using any copy/file/template related functions in + libselinux-python on them before using any copy/file/template related functions in Ansible. You can of course still use the yum module in Ansible to install this package on remote systems that do not have it. diff --git a/lib/ansible/module_common.py b/lib/ansible/module_common.py index 062ec0e036..55f184ff3b 100644 --- a/lib/ansible/module_common.py +++ b/lib/ansible/module_common.py @@ -269,7 +269,7 @@ class AnsibleModule(object): if seenabled is not None: (rc,out,err) = self.run_command(seenabled) if rc == 0: - self.fail_json(msg="Aborting, target uses selinux but python bindings (python-selinux) aren't installed!") + self.fail_json(msg="Aborting, target uses selinux but python bindings (libselinux-python) aren't installed!") return False if selinux.is_selinux_enabled() == 1: return True diff --git a/library/system/selinux b/library/system/selinux index f852c91ee9..af5f6efaab 100644 --- a/library/system/selinux +++ b/library/system/selinux @@ -61,7 +61,7 @@ import sys try: import selinux except ImportError: - print "failed=True msg='python-selinux required for this module'" + print "failed=True msg='libselinux-python required for this module'" sys.exit(1) # getter subroutines |