diff options
| author | Tomas Krizek <tkrizek@redhat.com> | 2017-02-06 13:08:11 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-02-21 17:09:00 +0100 |
| commit | 3372ad2766c0d182fa88c8bc28cf43477dc4cb3b (patch) | |
| tree | 90d5f637a56082bf2531339dc304c5276118aefe | |
| parent | cc446fb44870592f73af9c0dc2a35c5d37ce7a5c (diff) | |
| download | freeipa-3372ad2766c0d182fa88c8bc28cf43477dc4cb3b.tar.gz freeipa-3372ad2766c0d182fa88c8bc28cf43477dc4cb3b.tar.xz freeipa-3372ad2766c0d182fa88c8bc28cf43477dc4cb3b.zip | |
Add fips_mode variable to env
Variable fips_mode indicating whether machine is running in
FIPS-enabled mode was added to env.
https://fedorahosted.org/freeipa/ticket/5695
Reviewed-By: Martin Basti <mbasti@redhat.com>
Reviewed-By: Jan Cholasta <jcholast@redhat.com>
Reviewed-By: Stanislav Laznicka <slaznick@redhat.com>
| -rw-r--r-- | ipalib/config.py | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/ipalib/config.py b/ipalib/config.py index 1a5987920..388ffe81b 100644 --- a/ipalib/config.py +++ b/ipalib/config.py @@ -47,6 +47,10 @@ from ipalib.constants import ( TLS_VERSIONS ) from ipalib import errors +try: + from ipaplatform.tasks import tasks +except ImportError: + tasks = None if six.PY3: unicode = str @@ -443,6 +447,10 @@ class Env(object): self.bin = path.dirname(self.script) self.home = os.environ.get('HOME', None) + # Set fips_mode only if ipaplatform module was loaded + if tasks is not None: + self.fips_mode = tasks.is_fips_enabled() + # Merge in overrides: self._merge(**overrides) |