diff options
| author | Stanislav Laznicka <slaznick@redhat.com> | 2016-12-06 08:55:56 +0100 |
|---|---|---|
| committer | Martin Basti <mbasti@redhat.com> | 2017-02-13 18:10:55 +0100 |
| commit | 08c71703a44d8aec308781351c3a9dd4a4ba94a7 (patch) | |
| tree | 45b6d8f4cc2302d1e6fb2ea435301b3464c596af /ipaserver | |
| parent | 8d3bea8accb9814b3a973f4a606110fee78baf72 (diff) | |
| download | freeipa-08c71703a44d8aec308781351c3a9dd4a4ba94a7.tar.gz freeipa-08c71703a44d8aec308781351c3a9dd4a4ba94a7.tar.xz freeipa-08c71703a44d8aec308781351c3a9dd4a4ba94a7.zip | |
Remove is_fips_enabled checks in installers and ipactl
https://fedorahosted.org/freeipa/ticket/5695
Reviewed-By: Tomas Krizek <tkrizek@redhat.com>
Diffstat (limited to 'ipaserver')
| -rw-r--r-- | ipaserver/install/server/install.py | 4 | ||||
| -rw-r--r-- | ipaserver/install/server/replicainstall.py | 13 |
2 files changed, 7 insertions, 10 deletions
diff --git a/ipaserver/install/server/install.py b/ipaserver/install/server/install.py index ef943f71c..8178d4e29 100644 --- a/ipaserver/install/server/install.py +++ b/ipaserver/install/server/install.py @@ -304,10 +304,6 @@ def install_check(installer): external_ca_file = installer._external_ca_file http_ca_cert = installer._ca_cert - if tasks.is_fips_enabled(): - raise RuntimeError( - "Installing IPA server in FIPS mode is not supported") - tasks.check_selinux_status() if options.master_password: diff --git a/ipaserver/install/server/replicainstall.py b/ipaserver/install/server/replicainstall.py index 24cc661d2..fcb979c15 100644 --- a/ipaserver/install/server/replicainstall.py +++ b/ipaserver/install/server/replicainstall.py @@ -527,10 +527,6 @@ def check_remote_version(api): def common_check(no_ntp): - if tasks.is_fips_enabled(): - raise RuntimeError( - "Installing IPA server in FIPS mode is not supported") - tasks.check_selinux_status() if is_ipa_configured(): @@ -646,7 +642,12 @@ def install_check(installer): filename = installer.replica_file installer._enrollment_performed = False - # check FIPS, selinux status, http and DS ports, NTP conflicting services + if tasks.is_fips_enabled(): + raise RuntimeError( + "Installing IPA server in FIPS mode on domain level 0 is not " + "supported") + + # check selinux status, http and DS ports, NTP conflicting services common_check(options.no_ntp) client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) @@ -942,7 +943,7 @@ def promote_check(installer): installer._enrollment_performed = False installer._top_dir = tempfile.mkdtemp("ipa") - # check FIPS, selinux status, http and DS ports, NTP conflicting services + # check selinux status, http and DS ports, NTP conflicting services common_check(options.no_ntp) client_fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE) |