mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-05-15 05:52:24 +00:00
ipareplica: Replace ipaserver_master_password, remove ipaserver_setup_ntp
ipaserver_master_password and ipaserver_setup_ntp have been linked from the ipaserver role before. With the move of the module_utils parts to the specific role locations the use of ipaserver modules leads to the missing dependency ansible_ipa_server, that is now only available in the server role. The ipaserver_master_password module has been replaced by the ipareplica specific ipareplica_master_password module. The ipaserver_setup_ntp module has been removed as the time related changes for replica are done in the client install part. Fixes: #59 (Module is missing interpreter line)
This commit is contained in:
@@ -59,6 +59,7 @@ if NUM_VERSION >= 40600:
|
||||
|
||||
from ipaclient.install.ipachangeconf import IPAChangeConf
|
||||
from ipalib.install import certstore, sysrestore
|
||||
from ipapython.ipautil import ipa_generate_password
|
||||
from ipalib.install.kinit import kinit_keytab
|
||||
from ipapython import ipaldap, ipautil, kernel_keyring
|
||||
from ipapython.certdb import IPA_CA_TRUST_FLAGS, EXTERNAL_CA_TRUST_FLAGS
|
||||
@@ -101,18 +102,6 @@ if NUM_VERSION >= 40600:
|
||||
if six.PY3:
|
||||
unicode = str
|
||||
|
||||
try:
|
||||
from ipaclient.install import timeconf
|
||||
time_service = "chronyd"
|
||||
ntpinstance = None
|
||||
except ImportError:
|
||||
try:
|
||||
from ipaclient.install import ntpconf as timeconf
|
||||
except ImportError:
|
||||
from ipaclient import ntpconf as timeconf
|
||||
from ipaserver.install import ntpinstance
|
||||
time_service = "ntpd"
|
||||
|
||||
else:
|
||||
# IPA version < 4.6
|
||||
|
||||
|
||||
Reference in New Issue
Block a user