diff --git a/roles/ipaclient/action_plugins/ipaclient_get_otp.py b/roles/ipaclient/action_plugins/ipaclient_get_otp.py
index 9e529f8e74bb3f8836e10913ad8a85c2819a84e3..9850f72f23cffe79777b1ae893ff701d611789a0 100644
--- a/roles/ipaclient/action_plugins/ipaclient_get_otp.py
+++ b/roles/ipaclient/action_plugins/ipaclient_get_otp.py
@@ -31,11 +31,6 @@ from ansible.errors import AnsibleError
from ansible.module_utils._text import to_native
from ansible.plugins.action import ActionBase
-try:
- from __main__ import display
-except ImportError:
- from ansible.utils.display import Display
- display = Display()
def run_cmd(args, stdin=None):
"""
diff --git a/roles/ipaclient/library/ipaclient_get_otp.py b/roles/ipaclient/library/ipaclient_get_otp.py
index 3ec7541a97259f8200bcbbca373ad17e8218e23a..b6463c1545af9617043b97e8cac701e5b3f220e4 100644
--- a/roles/ipaclient/library/ipaclient_get_otp.py
+++ b/roles/ipaclient/library/ipaclient_get_otp.py
@@ -88,26 +88,6 @@ EXAMPLES = '''
ipaddress: 192.168.100.23
random: True
register: result_ipaclient_get_otp
-
-# Add a new host, authenticate with a keytab stored on the controller node
-- ipaclient_get_otp:
- keytab: admin.keytab
- fqdn: ipaclient.ipa.domain.com
-
-# Remove a host, authenticate using principal/password
-- ipaclient_get_otp:
- principal: admin
- password: MySecretPassword
- fqdn: ipaclient.ipa.domain.com
- state: absent
-
-# Modify a host, add ssh public key:
-- ipaclient_get_otp:
- principal: admin
- password: MySecretPassword
- fqdn: ipaclient.ipa.domain.com
- sshpubkey: ssh-rsa AAAA...
-
'''
RETURN = '''
diff --git a/roles/ipaclient/library/ipaclient_setup_ntp.py b/roles/ipaclient/library/ipaclient_setup_ntp.py
index 382f6b3184b8ad05db0a82990e4ff09d61ad9c5b..c2b0425dde99f99b669d1320caf33bd2aecd2970 100644
--- a/roles/ipaclient/library/ipaclient_setup_ntp.py
+++ b/roles/ipaclient/library/ipaclient_setup_ntp.py
@@ -96,7 +96,7 @@ def main():
ntp_servers=dict(required=False, type='list', default=None),
ntp_pool=dict(required=False, default=None),
no_ntp=dict(required=False, type='bool', default=False),
- #force_ntpd=dict(required=False, type='bool', default=False),
+ # force_ntpd=dict(required=False, type='bool', default=False),
on_master=dict(required=False, type='bool', default=False),
### additional ###
servers=dict(required=False, type='list', default=None),
@@ -109,7 +109,7 @@ def main():
options.ntp_servers = module.params.get('ntp_servers')
options.ntp_pool = module.params.get('ntp_pool')
options.no_ntp = module.params.get('no_ntp')
- #options.force_ntpd = module.params.get('force_ntpd')
+ # options.force_ntpd = module.params.get('force_ntpd')
options.on_master = module.params.get('on_master')
cli_server = module.params.get('servers')
cli_domain = module.params.get('domain')
diff --git a/roles/ipaclient/library/ipaclient_test.py b/roles/ipaclient/library/ipaclient_test.py
index f12bb563edc34d4931a3f3fd3db1d0c296cdc59f..abacbd90d12822d34c99b3f1b12471eab306a74f 100644
--- a/roles/ipaclient/library/ipaclient_test.py
+++ b/roles/ipaclient/library/ipaclient_test.py
@@ -451,7 +451,7 @@ def main():
dnsok = False
cli_domain = None
cli_server = None
- subject_base = None
+ # subject_base = None
cli_realm = None
cli_kdc = None
client_domain = None
@@ -467,7 +467,7 @@ def main():
cli_domain_source = 'Unknown source'
cli_server_source = 'Unknown source'
- fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
+ # fstore = sysrestore.FileStore(paths.IPA_CLIENT_SYSRESTORE)
if not os.getegid() == 0:
raise ScriptError(
@@ -824,7 +824,7 @@ def main():
cli_basedn = ds.basedn
cli_basedn_source = ds.basedn_source
logger.debug("will use discovered basedn: %s", cli_basedn)
- subject_base = DN(('O', cli_realm))
+ # subject_base = DN(('O', cli_realm))
logger.info("Client hostname: %s", hostname)
logger.debug("Hostname source: %s", hostname_source)
@@ -877,8 +877,6 @@ def main():
### client._install ###
- statestore = sysrestore.StateFile(paths.IPA_CLIENT_SYSRESTORE)
-
# May not happen in here at this time
#if not options.on_master:
# # Try removing old principals from the keytab
diff --git a/roles/ipaclient/library/ipaclient_test_keytab.py b/roles/ipaclient/library/ipaclient_test_keytab.py
index 37851deb88deab7cac6360cf573015ab333ab400..9b5b64e5fdf4405eeffb896b4c8648eafcee15c7 100644
--- a/roles/ipaclient/library/ipaclient_test_keytab.py
+++ b/roles/ipaclient/library/ipaclient_test_keytab.py
@@ -100,10 +100,6 @@ ping_test_ok:
type: bool
'''
-class Object(object):
- pass
-options = Object()
-
import os
import tempfile
diff --git a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
index a7253e3d361fe95146da1eed475b6a979b1d1163..6c5a0963f81c847b574951450db501477e84d267 100644
--- a/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
+++ b/roles/ipareplica/library/ipareplica_add_to_ipaservers.py
@@ -97,13 +97,9 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALLER ==")
options = installer
- promote = installer.promote
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
diff --git a/roles/ipareplica/library/ipareplica_create_ipa_conf.py b/roles/ipareplica/library/ipareplica_create_ipa_conf.py
index e46421a5a41d3afed5a5619d06faf779b8edfd30..9f13432a9128a1d22a526b8b44b54b0645fd44ef 100644
--- a/roles/ipareplica/library/ipareplica_create_ipa_conf.py
+++ b/roles/ipareplica/library/ipareplica_create_ipa_conf.py
@@ -94,18 +94,6 @@ options:
_ca_enabled:
description:
required: yes
- _kra_enabled:
- description:
- required: yes
- _dirsrv_pkcs12_info:
- description:
- required: yes
- _http_pkcs12_info:
- description:
- required: yes
- _pkinit_pkcs12_info:
- description:
- required: yes
_top_dir:
description:
required: yes
@@ -176,10 +164,6 @@ def main():
ccache=dict(required=True),
installer_ccache=dict(required=True),
_ca_enabled=dict(required=False, type='bool'),
- _kra_enabled=dict(required=False, type='bool'),
- _dirsrv_pkcs12_info = dict(required=False),
- _http_pkcs12_info = dict(required=False),
- _pkinit_pkcs12_info = dict(required=False),
_top_dir = dict(required=True),
_add_to_ipaservers = dict(required=True, type='bool'),
_ca_subject=dict(required=True),
@@ -235,11 +219,6 @@ def main():
#os.environ['KRB5CCNAME'] = ansible_module.params.get('installer_ccache')
installer._ccache = ansible_module.params.get('installer_ccache')
ca_enabled = ansible_module.params.get('_ca_enabled')
- kra_enabled = ansible_module.params.get('_kra_enabled')
-
- dirsrv_pkcs12_info = ansible_module.params.get('_dirsrv_pkcs12_info')
- http_pkcs12_info = ansible_module.params.get('_http_pkcs12_info')
- pkinit_pkcs12_info = ansible_module.params.get('_pkinit_pkcs12_info')
options.subject_base = ansible_module.params.get('subject_base')
if options.subject_base is not None:
@@ -256,7 +235,6 @@ def main():
# init #
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
# prepare (install prepare, install checks) #
@@ -276,11 +254,8 @@ def main():
remote_api = gen_remote_api(master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
- cafile = paths.IPA_CA_CRT
-
if promote:
ansible_log.debug("-- CREATE_IPA_CONF --")
# Create the management framework config file. Do this irregardless
diff --git a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
index 922c888001f7e262fd495c55c6379090054af8b5..d32ca36fc00e37035703cf294f41093483ccce93 100644
--- a/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
+++ b/roles/ipareplica/library/ipareplica_custodia_import_dm_password.py
@@ -70,12 +70,6 @@ options:
_kra_host_name:
description:
required: yes
- _dirsrv_pkcs12_info:
- description:
- required: yes
- _pkinit_pkcs12_info:
- description:
- required: yes
_top_dir:
description:
required: yes
@@ -111,8 +105,6 @@ def main():
_ca_file=dict(required=False),
_kra_enabled=dict(required=False, type='bool'),
_kra_host_name=dict(required=False),
- _dirsrv_pkcs12_info = dict(required=False),
- _pkinit_pkcs12_info = dict(required=False),
_top_dir = dict(required=True),
dirman_password=dict(required=True, no_log=True),
config_setup_ca=dict(required=True, type='bool'),
@@ -145,8 +137,6 @@ def main():
ca_enabled = ansible_module.params.get('_ca_enabled')
kra_enabled = ansible_module.params.get('_kra_enabled')
kra_host_name = ansible_module.params.get('_kra_host_name')
- dirsrv_pkcs12_info = ansible_module.params.get('_dirsrv_pkcs12_info')
- pkinit_pkcs12_info = ansible_module.params.get('_pkinit_pkcs12_info')
options._top_dir = ansible_module.params.get('_top_dir')
dirman_password = ansible_module.params.get('dirman_password')
config_setup_ca = ansible_module.params.get('config_setup_ca')
@@ -154,9 +144,6 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
options = installer
@@ -177,7 +164,6 @@ def main():
remote_api = gen_remote_api(config.master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
# do the work #
diff --git a/roles/ipareplica/library/ipareplica_ds_apply_updates.py b/roles/ipareplica/library/ipareplica_ds_apply_updates.py
index a2fc4bb37e83d8c89f2c93e734499b23d1d41ca0..5c1b08cae3557d15f8bdd0b8870372c031934082 100644
--- a/roles/ipareplica/library/ipareplica_ds_apply_updates.py
+++ b/roles/ipareplica/library/ipareplica_ds_apply_updates.py
@@ -105,14 +105,10 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
options = installer
promote = installer.promote
- pkinit_pkcs12_info = installer._pkinit_pkcs12_info
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
@@ -122,7 +118,6 @@ def main():
config.subject_base = options.subject_base
remote_api = gen_remote_api(master_host_name, paths.ETC_IPA)
- #installer._remote_api = remote_api
conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
@@ -132,7 +127,6 @@ def main():
api.Backend.ldap2.connect()
conn.connect(ccache=ccache)
- cafile = paths.IPA_CA_CRT
with redirect_stdout(ansible_log):
ds = replica_ds_init_info(ansible_log,
config, options, ca_enabled,
diff --git a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
index d82a0704e2d369049c450cf1fa462ae8fa09da60..49237430b872c8331b533064b35d44247a573c57 100644
--- a/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
+++ b/roles/ipareplica/library/ipareplica_ds_enable_ssl.py
@@ -143,14 +143,10 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
options = installer
promote = installer.promote
- pkinit_pkcs12_info = installer._pkinit_pkcs12_info
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
diff --git a/roles/ipareplica/library/ipareplica_enable_ipa.py b/roles/ipareplica/library/ipareplica_enable_ipa.py
index d54a746bc77de39a30b8fdbc7fd20c00589b5cf9..908da223ef3a2acd889fdd1d4061378a3105e583 100644
--- a/roles/ipareplica/library/ipareplica_enable_ipa.py
+++ b/roles/ipareplica/library/ipareplica_enable_ipa.py
@@ -109,13 +109,8 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
- promote = installer.promote
-
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
api_bootstrap_finalize(env)
@@ -124,7 +119,6 @@ def main():
remote_api = gen_remote_api(config_master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
api.Backend.ldap2.connect()
diff --git a/roles/ipareplica/library/ipareplica_install_ca_certs.py b/roles/ipareplica/library/ipareplica_install_ca_certs.py
index 45066cf416f7cbf5083494f454e26937b693ad04..71f296e09e8bbe08b0671778547c77af3cbc9050 100644
--- a/roles/ipareplica/library/ipareplica_install_ca_certs.py
+++ b/roles/ipareplica/library/ipareplica_install_ca_certs.py
@@ -128,11 +128,6 @@ def main():
server=dict(required=True),
ccache=dict(required=True),
installer_ccache=dict(required=True),
- _ca_enabled=dict(required=False, type='bool'),
- _kra_enabled=dict(required=False, type='bool'),
- _dirsrv_pkcs12_info = dict(required=False),
- _http_pkcs12_info = dict(required=False),
- _pkinit_pkcs12_info = dict(required=False),
_top_dir = dict(required=True),
_add_to_ipaservers = dict(required=True, type='bool'),
_ca_subject=dict(required=True),
@@ -186,11 +181,6 @@ def main():
os.environ['KRB5CCNAME'] = ccache
#os.environ['KRB5CCNAME'] = ansible_module.params.get('installer_ccache')
installer._ccache = ansible_module.params.get('installer_ccache')
- ca_enabled = ansible_module.params.get('_ca_enabled')
- kra_enabled = ansible_module.params.get('_kra_enabled')
- dirsrv_pkcs12_info = ansible_module.params.get('_dirsrv_pkcs12_info')
- http_pkcs12_info = ansible_module.params.get('_http_pkcs12_info')
- pkinit_pkcs12_info = ansible_module.params.get('_pkinit_pkcs12_info')
options.subject_base = ansible_module.params.get('subject_base')
if options.subject_base is not None:
options.subject_base = DN(options.subject_base)
@@ -207,9 +197,6 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALLER ==")
options = installer
diff --git a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
index f4abcda345a90305de2c538e6326737dce9d7dc5..58d8301290720c001360acdaf48ecad4cae9004b 100644
--- a/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
+++ b/roles/ipareplica/library/ipareplica_krb_enable_ssl.py
@@ -64,7 +64,6 @@ def main():
ccache=dict(required=True),
_ca_enabled=dict(required=False, type='bool'),
_ca_file=dict(required=False),
- _dirsrv_pkcs12_info = dict(required=False),
_pkinit_pkcs12_info = dict(required=False),
_top_dir = dict(required=True),
dirman_password=dict(required=True, no_log=True),
@@ -92,8 +91,6 @@ def main():
os.environ['KRB5CCNAME'] = ccache
#os.environ['KRB5CCNAME'] = ansible_module.params.get('installer_ccache')
#installer._ccache = ansible_module.params.get('installer_ccache')
- ca_enabled = ansible_module.params.get('_ca_enabled')
- dirsrv_pkcs12_info = ansible_module.params.get('_dirsrv_pkcs12_info')
options._pkinit_pkcs12_info = ansible_module.params.get('_pkinit_pkcs12_info')
options._top_dir = ansible_module.params.get('_top_dir')
dirman_password = ansible_module.params.get('dirman_password')
@@ -101,13 +98,10 @@ def main():
# init #
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
ansible_log.debug("== INSTALL ==")
options = installer
- promote = installer.promote
- pkinit_pkcs12_info = installer._pkinit_pkcs12_info
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
diff --git a/roles/ipareplica/library/ipareplica_master_password.py b/roles/ipareplica/library/ipareplica_master_password.py
index d458e66a186b0d8037e73e4f07dd03665b2ff0f6..19ebc3a7199dc3320c779eb192a7dcb570ab9a84 100644
--- a/roles/ipareplica/library/ipareplica_master_password.py
+++ b/roles/ipareplica/library/ipareplica_master_password.py
@@ -67,16 +67,13 @@ def main():
module._ansible_debug = True
- options.master_password = module.params.get('master_password')
+ master_password = module.params.get('master_password')
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
- if not options.master_password:
- options.master_password = ipa_generate_password()
+ if not master_password:
+ master_password = ipa_generate_password()
module.exit_json(changed=True,
- password=options.master_password)
+ password=master_password)
if __name__ == '__main__':
main()
diff --git a/roles/ipareplica/library/ipareplica_promote_openldap_conf.py b/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
index 8a003133a0538868c722888c86972141ee53ce52..6327badd397496a346bb9c1e0e1896e878113e1b 100644
--- a/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
+++ b/roles/ipareplica/library/ipareplica_promote_openldap_conf.py
@@ -106,14 +106,8 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
-
ansible_log.debug("== INSTALL ==")
- promote = installer.promote
-
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
api_bootstrap_finalize(env)
@@ -125,7 +119,6 @@ def main():
remote_api = gen_remote_api(config.master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
with redirect_stdout(ansible_log):
diff --git a/roles/ipareplica/library/ipareplica_promote_sssd.py b/roles/ipareplica/library/ipareplica_promote_sssd.py
index 7494d33f1f13a2e55fa8bccd0f831da929885402..8fc71bf91490cc10495c916c2939c0e04f327bcd 100644
--- a/roles/ipareplica/library/ipareplica_promote_sssd.py
+++ b/roles/ipareplica/library/ipareplica_promote_sssd.py
@@ -106,13 +106,8 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
- promote = installer.promote
-
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
api_bootstrap_finalize(env)
@@ -124,7 +119,6 @@ def main():
remote_api = gen_remote_api(config.master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
with redirect_stdout(ansible_log):
diff --git a/roles/ipareplica/library/ipareplica_restart_kdc.py b/roles/ipareplica/library/ipareplica_restart_kdc.py
index dbd8e255c28517103e34609ad8f6df2923ca88b1..e766ff85c9653fd2867eae0634cc4186b99c6c8c 100644
--- a/roles/ipareplica/library/ipareplica_restart_kdc.py
+++ b/roles/ipareplica/library/ipareplica_restart_kdc.py
@@ -63,10 +63,7 @@ def main():
#### additional ###
config_master_host_name=dict(required=True),
ccache=dict(required=True),
- _ca_enabled=dict(required=False, type='bool'),
_ca_file=dict(required=False),
- _dirsrv_pkcs12_info = dict(required=False),
- #_pkinit_pkcs12_info = dict(required=False),
_top_dir = dict(required=True),
dirman_password=dict(required=True, no_log=True),
),
@@ -91,24 +88,16 @@ def main():
master_host_name = ansible_module.params.get('config_master_host_name')
ccache = ansible_module.params.get('ccache')
os.environ['KRB5CCNAME'] = ccache
- #os.environ['KRB5CCNAME'] = ansible_module.params.get('installer_ccache')
- #installer._ccache = ansible_module.params.get('installer_ccache')
- ca_enabled = ansible_module.params.get('_ca_enabled')
- dirsrv_pkcs12_info = ansible_module.params.get('_dirsrv_pkcs12_info')
- #pkinit_pkcs12_info = ansible_module.params.get('_pkinit_pkcs12_info')
options._top_dir = ansible_module.params.get('_top_dir')
dirman_password = ansible_module.params.get('dirman_password')
# init #
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
ansible_log.debug("== INSTALL ==")
options = installer
- promote = installer.promote
- #pkinit_pkcs12_info = installer._pkinit_pkcs12_info
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
@@ -117,7 +106,6 @@ def main():
config.dirman_password = dirman_password
remote_api = gen_remote_api(master_host_name, paths.ETC_IPA)
- #installer._remote_api = remote_api
conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
diff --git a/roles/ipareplica/library/ipareplica_setup_adtrust.py b/roles/ipareplica/library/ipareplica_setup_adtrust.py
index 565aee117a00d9733a7520cca491ab0c7630af90..93b7ac78e35a16be9661fdab8fca5191c6c138e0 100644
--- a/roles/ipareplica/library/ipareplica_setup_adtrust.py
+++ b/roles/ipareplica/library/ipareplica_setup_adtrust.py
@@ -119,12 +119,9 @@ def main():
# init #
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
ansible_log.debug("== INSTALL ==")
- promote = installer.promote
-
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
api_bootstrap_finalize(env)
@@ -135,7 +132,6 @@ def main():
remote_api = gen_remote_api(config.master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
api.Backend.ldap2.connect()
diff --git a/roles/ipareplica/library/ipareplica_setup_ca.py b/roles/ipareplica/library/ipareplica_setup_ca.py
index 788fdae29334a2200b382c22f97cf533a5f7fc91..3291facc5c510cc2fcf25128a6a24e8d7f4aa040 100644
--- a/roles/ipareplica/library/ipareplica_setup_ca.py
+++ b/roles/ipareplica/library/ipareplica_setup_ca.py
@@ -46,9 +46,6 @@ options:
no_pkinit:
description:
required: yes
- no_ui_redirect:
- description:
- required: yes
subject_base:
description:
required: yes
@@ -117,7 +114,6 @@ def main():
setup_ca=dict(required=False, type='bool'),
setup_kra=dict(required=False, type='bool'),
no_pkinit=dict(required=False, type='bool'),
- no_ui_redirect=dict(required=False, type='bool'),
#### certificate system ###
subject_base=dict(required=True),
#### additional ###
@@ -180,14 +176,9 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
options = installer
- promote = installer.promote
- pkinit_pkcs12_info = installer._pkinit_pkcs12_info
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
@@ -206,7 +197,6 @@ def main():
remote_api = gen_remote_api(config.master_host_name, paths.ETC_IPA)
options._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
# There is a api.Backend.ldap2.connect call somewhere in ca, ds, dns or
diff --git a/roles/ipareplica/library/ipareplica_setup_certmonger.py b/roles/ipareplica/library/ipareplica_setup_certmonger.py
index d9829757f4b799ff8688fd8662926347ae9ad45b..264498b91ddbe9385ef76516423bd6ced84d34f9 100644
--- a/roles/ipareplica/library/ipareplica_setup_certmonger.py
+++ b/roles/ipareplica/library/ipareplica_setup_certmonger.py
@@ -62,8 +62,6 @@ def main():
# get parameters #
- options = installer
-
with redirect_stdout(ansible_log):
ansible_log.debug("-- CONFIGURE_CERTMONGER --")
diff --git a/roles/ipareplica/library/ipareplica_setup_custodia.py b/roles/ipareplica/library/ipareplica_setup_custodia.py
index ad950ad4cfa455ddf3cb215f5339c0910724675d..f0ecb2b0edf9d0ca1c061e1c6ac9b8e9051f3b6a 100644
--- a/roles/ipareplica/library/ipareplica_setup_custodia.py
+++ b/roles/ipareplica/library/ipareplica_setup_custodia.py
@@ -106,7 +106,6 @@ def main():
_ca_file=dict(required=False),
_kra_enabled=dict(required=False, type='bool'),
_kra_host_name=dict(required=False),
- _dirsrv_pkcs12_info = dict(required=False),
_pkinit_pkcs12_info = dict(required=False),
_top_dir = dict(required=True),
dirman_password=dict(required=True, no_log=True),
@@ -137,21 +136,16 @@ def main():
ca_enabled = ansible_module.params.get('_ca_enabled')
kra_enabled = ansible_module.params.get('_kra_enabled')
kra_host_name = ansible_module.params.get('_kra_host_name')
- dirsrv_pkcs12_info = ansible_module.params.get('_dirsrv_pkcs12_info')
options._pkinit_pkcs12_info = ansible_module.params.get('_pkinit_pkcs12_info')
options._top_dir = ansible_module.params.get('_top_dir')
dirman_password = ansible_module.params.get('dirman_password')
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
options = installer
promote = installer.promote
- pkinit_pkcs12_info = installer._pkinit_pkcs12_info
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
@@ -163,7 +157,6 @@ def main():
config.kra_host_name = kra_host_name
remote_api = gen_remote_api(master_host_name, paths.ETC_IPA)
- #installer._remote_api = remote_api
conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
diff --git a/roles/ipareplica/library/ipareplica_setup_dns.py b/roles/ipareplica/library/ipareplica_setup_dns.py
index 6cf141ca42233780ccf223e19e70d1aada521242..980c4c892a4f50bf74cf2eb4e976b8dbca3453fe 100644
--- a/roles/ipareplica/library/ipareplica_setup_dns.py
+++ b/roles/ipareplica/library/ipareplica_setup_dns.py
@@ -122,13 +122,8 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
- promote = installer.promote
-
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
api_bootstrap_finalize(env)
@@ -139,7 +134,6 @@ def main():
remote_api = gen_remote_api(config.master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
# There is a api.Backend.ldap2.connect call somewhere in ca, ds, dns or
diff --git a/roles/ipareplica/library/ipareplica_setup_ds.py b/roles/ipareplica/library/ipareplica_setup_ds.py
index b5759395e215b7c55e637e5d39697bcbaaa834d4..551750563216f3aefbf38ab0d56621fccb83237a 100644
--- a/roles/ipareplica/library/ipareplica_setup_ds.py
+++ b/roles/ipareplica/library/ipareplica_setup_ds.py
@@ -94,18 +94,9 @@ options:
_ca_enabled:
description:
required: yes
- _kra_enabled:
- description:
- required: yes
_dirsrv_pkcs12_info:
description:
required: yes
- _http_pkcs12_info:
- description:
- required: yes
- _pkinit_pkcs12_info:
- description:
- required: yes
_top_dir:
description:
required: yes
@@ -176,10 +167,7 @@ def main():
ccache=dict(required=True),
installer_ccache=dict(required=True),
_ca_enabled=dict(required=False, type='bool'),
- _kra_enabled=dict(required=False, type='bool'),
_dirsrv_pkcs12_info = dict(required=False),
- _http_pkcs12_info = dict(required=False),
- _pkinit_pkcs12_info = dict(required=False),
_top_dir = dict(required=True),
_add_to_ipaservers = dict(required=True, type='bool'),
_ca_subject=dict(required=True),
@@ -238,11 +226,8 @@ def main():
#os.environ['KRB5CCNAME'] = ansible_module.params.get('installer_ccache')
installer._ccache = ansible_module.params.get('installer_ccache')
ca_enabled = ansible_module.params.get('_ca_enabled')
- kra_enabled = ansible_module.params.get('_kra_enabled')
dirsrv_pkcs12_info = ansible_module.params.get('_dirsrv_pkcs12_info')
- http_pkcs12_info = ansible_module.params.get('_http_pkcs12_info')
- pkinit_pkcs12_info = ansible_module.params.get('_pkinit_pkcs12_info')
options.subject_base = ansible_module.params.get('subject_base')
if options.subject_base is not None:
@@ -263,7 +248,6 @@ def main():
# init #
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
ansible_log.debug("== INSTALL ==")
diff --git a/roles/ipareplica/library/ipareplica_setup_http.py b/roles/ipareplica/library/ipareplica_setup_http.py
index f7d7a99313d00ac5ffee6a79c2ec992157fae267..91167ac7ab8ade13f897ea6f405948ebebf61c1f 100644
--- a/roles/ipareplica/library/ipareplica_setup_http.py
+++ b/roles/ipareplica/library/ipareplica_setup_http.py
@@ -137,11 +137,9 @@ def main():
# init #
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
ansible_log.debug("== INSTALL ==")
- options = installer
promote = installer.promote
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
diff --git a/roles/ipareplica/library/ipareplica_setup_kra.py b/roles/ipareplica/library/ipareplica_setup_kra.py
index fadb94dc786df3e6a04901f3ec3407de29e820e3..4c38572ddcbd5a6073a7f20257916b6bfbff30e4 100644
--- a/roles/ipareplica/library/ipareplica_setup_kra.py
+++ b/roles/ipareplica/library/ipareplica_setup_kra.py
@@ -116,9 +116,6 @@ def main():
_ca_enabled=dict(required=False, type='bool'),
_kra_enabled=dict(required=False, type='bool'),
_kra_host_name=dict(required=False),
- _dirsrv_pkcs12_info = dict(required=False),
- _http_pkcs12_info = dict(required=False),
- _pkinit_pkcs12_info = dict(required=False),
_top_dir = dict(required=True),
_add_to_ipaservers = dict(required=True, type='bool'),
_ca_subject=dict(required=True),
@@ -179,10 +176,6 @@ def main():
kra_enabled = ansible_module.params.get('_kra_enabled')
kra_host_name = ansible_module.params.get('_kra_host_name')
- dirsrv_pkcs12_info = ansible_module.params.get('_dirsrv_pkcs12_info')
- http_pkcs12_info = ansible_module.params.get('_http_pkcs12_info')
- pkinit_pkcs12_info = ansible_module.params.get('_pkinit_pkcs12_info')
-
options.subject_base = ansible_module.params.get('subject_base')
if options.subject_base is not None:
options.subject_base = DN(options.subject_base)
@@ -194,13 +187,9 @@ def main():
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
options = installer
- promote = installer.promote
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
@@ -214,7 +203,6 @@ def main():
remote_api = gen_remote_api(master_host_name, paths.ETC_IPA)
installer._remote_api = remote_api
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
with redirect_stdout(ansible_log):
diff --git a/roles/ipareplica/library/ipareplica_setup_krb.py b/roles/ipareplica/library/ipareplica_setup_krb.py
index b5dd1d7f0e411c0518291c4b6a790b974d27c0de..ba27fc693600e17fa8a7484ed0e03ce69f29ce2d 100644
--- a/roles/ipareplica/library/ipareplica_setup_krb.py
+++ b/roles/ipareplica/library/ipareplica_setup_krb.py
@@ -117,7 +117,6 @@ def main():
# init #
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
ansible_log.debug("== INSTALL ==")
@@ -132,10 +131,6 @@ def main():
config.master_host_name = config_master_host_name
config.subject_base = options.subject_base
- remote_api = gen_remote_api(config.master_host_name, paths.ETC_IPA)
- #installer._remote_api = remote_api
-
- conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
# There is a api.Backend.ldap2.connect call somewhere in ca, ds, dns or
diff --git a/roles/ipareplica/library/ipareplica_setup_otpd.py b/roles/ipareplica/library/ipareplica_setup_otpd.py
index 71d1ef845b6dbd2ea1250647d4d52b38944a9d9d..743e53fc26da8e450f7f8a2d4b0dd7703cba8bda 100644
--- a/roles/ipareplica/library/ipareplica_setup_otpd.py
+++ b/roles/ipareplica/library/ipareplica_setup_otpd.py
@@ -58,9 +58,6 @@ options:
ccache:
description:
required: yes
- _ca_enabled:
- description:
- required: yes
_ca_file:
description:
required: yes
@@ -96,7 +93,6 @@ def main():
#### additional ###
config_master_host_name=dict(required=True),
ccache=dict(required=True),
- _ca_enabled=dict(required=False, type='bool'),
_ca_file=dict(required=False),
_top_dir = dict(required=True),
dirman_password=dict(required=True, no_log=True),
@@ -123,19 +119,14 @@ def main():
os.environ['KRB5CCNAME'] = ccache
#os.environ['KRB5CCNAME'] = ansible_module.params.get('installer_ccache')
#installer._ccache = ansible_module.params.get('installer_ccache')
- ca_enabled = ansible_module.params.get('_ca_enabled')
options._top_dir = ansible_module.params.get('_top_dir')
dirman_password = ansible_module.params.get('dirman_password')
# init #
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
ansible_log.debug("== INSTALL ==")
options = installer
- promote = installer.promote
env = gen_env_boostrap_finalize_core(paths.ETC_IPA,
constants.DEFAULT_CONFIG)
@@ -144,7 +135,6 @@ def main():
config.dirman_password = dirman_password
remote_api = gen_remote_api(master_host_name, paths.ETC_IPA)
- #installer._remote_api = remote_api
conn = remote_api.Backend.ldap2
ccache = os.environ['KRB5CCNAME']
@@ -154,7 +144,6 @@ def main():
api.Backend.ldap2.connect()
conn.connect(ccache=ccache)
- cafile = paths.IPA_CA_CRT
with redirect_stdout(ansible_log):
ansible_log.debug("-- INSTALL_OTPD --")
diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml
index 97cbd413c1e7aaa6cca0df4b24d69f67621a206c..86638cb15c39a7b5963adcb803259da887d68948 100644
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -222,11 +222,6 @@
server: "{{ result_ipareplica_test.server }}"
ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
- _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
- _kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}"
- _dirsrv_pkcs12_info: "{{ result_ipareplica_prepare._dirsrv_pkcs12_info }}"
- _http_pkcs12_info: "{{ result_ipareplica_prepare._http_pkcs12_info }}"
- _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info }}"
subject_base: "{{ result_ipareplica_prepare.subject_base }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
_add_to_ipaservers: "{{ result_ipareplica_prepare._add_to_ipaservers }}"
@@ -270,10 +265,7 @@
ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
- _kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}"
_dirsrv_pkcs12_info: "{{ result_ipareplica_prepare._dirsrv_pkcs12_info }}"
- _http_pkcs12_info: "{{ result_ipareplica_prepare._http_pkcs12_info }}"
- _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info }}"
subject_base: "{{ result_ipareplica_prepare.subject_base }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
_add_to_ipaservers: "{{ result_ipareplica_prepare._add_to_ipaservers }}"
@@ -318,10 +310,6 @@
ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
- _kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}"
- _dirsrv_pkcs12_info: "{{ result_ipareplica_prepare._dirsrv_pkcs12_info }}"
- _http_pkcs12_info: "{{ result_ipareplica_prepare._http_pkcs12_info }}"
- _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info }}"
subject_base: "{{ result_ipareplica_prepare.subject_base }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
_add_to_ipaservers: "{{ result_ipareplica_prepare._add_to_ipaservers }}"
@@ -378,10 +366,6 @@
ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
- _kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}"
- _dirsrv_pkcs12_info: "{{ result_ipareplica_prepare._dirsrv_pkcs12_info }}"
- _http_pkcs12_info: "{{ result_ipareplica_prepare._http_pkcs12_info }}"
- _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info }}"
subject_base: "{{ result_ipareplica_prepare.subject_base }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
_add_to_ipaservers: "{{ result_ipareplica_prepare._add_to_ipaservers }}"
@@ -464,10 +448,6 @@
ccache: "{{ result_ipareplica_prepare.ccache }}"
installer_ccache: "{{ result_ipareplica_prepare.installer_ccache }}"
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
- _kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}"
- _dirsrv_pkcs12_info: "{{ result_ipareplica_prepare._dirsrv_pkcs12_info }}"
- _http_pkcs12_info: "{{ result_ipareplica_prepare._http_pkcs12_info }}"
- _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info }}"
subject_base: "{{ result_ipareplica_prepare.subject_base }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
_add_to_ipaservers: "{{ result_ipareplica_prepare._add_to_ipaservers }}"
@@ -489,7 +469,6 @@
config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}"
- _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
_ca_file: "{{ result_ipareplica_prepare._ca_file }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
dirman_password: "{{ ipareplica_dirman_password }}"
@@ -521,7 +500,6 @@
setup_ca: "{{ ipareplica_setup_ca }}"
setup_kra: "{{ result_ipareplica_test.setup_kra }}"
no_pkinit: "{{ ipareplica_no_pkinit }}"
- no_ui_redirect: "{{ ipareplica_no_ui_redirect }}"
### certificate system ###
subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ###
@@ -549,7 +527,6 @@
setup_ca: "{{ ipareplica_setup_ca }}"
setup_kra: "{{ result_ipareplica_test.setup_kra }}"
no_pkinit: "{{ ipareplica_no_pkinit }}"
- # no_ui_redirect: "{{ ipareplica_no_ui_redirect }}"
### certificate system ###
subject_base: "{{ result_ipareplica_prepare.subject_base }}"
### additional ###
@@ -614,9 +591,6 @@
_ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
_kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}"
_kra_host_name: "{{ result_ipareplica_prepare.config_kra_host_name }}"
- _dirsrv_pkcs12_info: "{{ result_ipareplica_prepare._dirsrv_pkcs12_info }}"
- _http_pkcs12_info: "{{ result_ipareplica_prepare._http_pkcs12_info }}"
- _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
_add_to_ipaservers: "{{ result_ipareplica_prepare._add_to_ipaservers }}"
_ca_subject: "{{ result_ipareplica_prepare._ca_subject }}"
@@ -636,9 +610,7 @@
config_master_host_name:
"{{ result_ipareplica_install_ca_certs.config_master_host_name }}"
ccache: "{{ result_ipareplica_prepare.ccache }}"
- _ca_enabled: "{{ result_ipareplica_prepare._ca_enabled }}"
_ca_file: "{{ result_ipareplica_prepare._ca_file }}"
- # _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
dirman_password: "{{ ipareplica_dirman_password }}"
@@ -660,7 +632,6 @@
_ca_file: "{{ result_ipareplica_prepare._ca_file }}"
_kra_enabled: "{{ result_ipareplica_prepare._kra_enabled }}"
_kra_host_name: "{{ result_ipareplica_prepare.config_kra_host_name }}"
- _pkinit_pkcs12_info: "{{ result_ipareplica_prepare._pkinit_pkcs12_info }}"
_top_dir: "{{ result_ipareplica_prepare._top_dir }}"
dirman_password: "{{ ipareplica_dirman_password }}"
config_setup_ca: "{{ result_ipareplica_prepare.config_setup_ca }}"
diff --git a/roles/ipaserver/library/ipaserver_enable_ipa.py b/roles/ipaserver/library/ipaserver_enable_ipa.py
index 0419c542ccda2588cedeeb200cae972710b3cbb2..1267d704d1b5e8b7b82fb1aba25304ce387e99a3 100644
--- a/roles/ipaserver/library/ipaserver_enable_ipa.py
+++ b/roles/ipaserver/library/ipaserver_enable_ipa.py
@@ -87,7 +87,6 @@ def main():
# setup ds ######################################################
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
if NUM_VERSION < 40600:
# Make sure the files we crated in /var/run are recreated at startup
diff --git a/roles/ipaserver/library/ipaserver_load_cache.py b/roles/ipaserver/library/ipaserver_load_cache.py
index 1c5fa7f0d5f788990d57dadeab14f48c0d2e194d..28b23477cda1d222c36c0d13cb922bcf18879e4a 100644
--- a/roles/ipaserver/library/ipaserver_load_cache.py
+++ b/roles/ipaserver/library/ipaserver_load_cache.py
@@ -59,7 +59,6 @@ def main():
)
ansible_module._ansible_debug = True
- ansible_log = AnsibleModuleLog(ansible_module)
# set values ############################################################
diff --git a/roles/ipaserver/library/ipaserver_master_password.py b/roles/ipaserver/library/ipaserver_master_password.py
index af8315a3175c96bbe51fb5ceaf23593d85ba2984..85153e9874e0b07dbe347546409e20817e0791b3 100644
--- a/roles/ipaserver/library/ipaserver_master_password.py
+++ b/roles/ipaserver/library/ipaserver_master_password.py
@@ -71,9 +71,6 @@ def main():
options.dm_password = module.params.get('dm_password')
options.master_password = module.params.get('master_password')
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
# This will override any settings passed in on the cmdline
if os.path.isfile(paths.ROOT_IPA_CACHE):
# dm_password check removed, checked already
diff --git a/roles/ipaserver/library/ipaserver_set_ds_password.py b/roles/ipaserver/library/ipaserver_set_ds_password.py
index 7042585803cc60b77aabd3bc0ac14dd48b5975fd..c9bf7c770b1941115d82b317d8fe7cf2aaf81700 100644
--- a/roles/ipaserver/library/ipaserver_set_ds_password.py
+++ b/roles/ipaserver/library/ipaserver_set_ds_password.py
@@ -112,7 +112,6 @@ def main():
# init ##########################################################
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
api_Backend_ldap2(options.host_name, options.setup_ca, connect=True)
diff --git a/roles/ipaserver/library/ipaserver_setup_adtrust.py b/roles/ipaserver/library/ipaserver_setup_adtrust.py
index 29166e1136cc733c241de5b361ce0915d7daeffe..454a852350bacada03f8b197a163f6f77f813c53 100644
--- a/roles/ipaserver/library/ipaserver_setup_adtrust.py
+++ b/roles/ipaserver/library/ipaserver_setup_adtrust.py
@@ -86,7 +86,6 @@ def main():
# init ##########################################################
fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
api_Backend_ldap2(options.host_name, options.setup_ca, connect=True)
diff --git a/roles/ipaserver/library/ipaserver_setup_custodia.py b/roles/ipaserver/library/ipaserver_setup_custodia.py
index 5fbb65c0d5dbb8c5e2056ef51244ad22aff5af6c..b84b5394db286816025d0a3e12cb0419cc7384b9 100644
--- a/roles/ipaserver/library/ipaserver_setup_custodia.py
+++ b/roles/ipaserver/library/ipaserver_setup_custodia.py
@@ -74,8 +74,6 @@ def main():
# init ##################################################################
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
-
api_Backend_ldap2(options.host_name, options.setup_ca, connect=True)
# setup custodia ########################################################
diff --git a/roles/ipaserver/library/ipaserver_setup_kra.py b/roles/ipaserver/library/ipaserver_setup_kra.py
index ae2946c6b5158594b548bad2190156e19f66fbf1..fd7429c41e212ed5e97af7916a7ac398d0a30d6d 100644
--- a/roles/ipaserver/library/ipaserver_setup_kra.py
+++ b/roles/ipaserver/library/ipaserver_setup_kra.py
@@ -78,9 +78,6 @@ def main():
# init ##########################################################
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
api_Backend_ldap2(options.host_name, options.setup_ca, connect=True)
# setup kra #####################################################
diff --git a/roles/ipaserver/library/ipaserver_setup_otpd.py b/roles/ipaserver/library/ipaserver_setup_otpd.py
index dc895c7295228a100f1cee33ce324e4253b4eae1..3db6cfb7bd15244a4ee8998a635a6d51d6959664 100644
--- a/roles/ipaserver/library/ipaserver_setup_otpd.py
+++ b/roles/ipaserver/library/ipaserver_setup_otpd.py
@@ -70,9 +70,6 @@ def main():
# init ##########################################################
- fstore = sysrestore.FileStore(paths.SYSRESTORE)
- sstore = sysrestore.StateFile(paths.SYSRESTORE)
-
api_Backend_ldap2(options.host_name, options.setup_ca, connect=True)
# setup ds ######################################################