mirror of
https://github.com/freeipa/ansible-freeipa.git
synced 2026-05-06 13:23:14 +00:00
ipareplica: The dm password is not needed for ipareplica_master_password
The module ipareplica_master_password has been a copy from ipaserver role and still contained code to read the cache file. This is not needed for the replica. Therefore there is no need also to provide the dm password to ipareplica_master_password any more.
This commit is contained in:
@@ -60,7 +60,6 @@ def main():
|
||||
module = AnsibleModule(
|
||||
argument_spec = dict(
|
||||
#basic
|
||||
dm_password=dict(required=True, no_log=True),
|
||||
master_password=dict(required=False, no_log=True),
|
||||
),
|
||||
supports_check_mode = True,
|
||||
@@ -68,21 +67,11 @@ def main():
|
||||
|
||||
module._ansible_debug = True
|
||||
|
||||
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
|
||||
try:
|
||||
cache_vars = read_cache(options.dm_password)
|
||||
options.__dict__.update(cache_vars)
|
||||
except Exception as e:
|
||||
module.fail_json(msg="Cannot process the cache file: %s" % str(e))
|
||||
|
||||
if not options.master_password:
|
||||
options.master_password = ipa_generate_password()
|
||||
|
||||
|
||||
@@ -178,7 +178,6 @@
|
||||
- name: Install - Create dirman password
|
||||
no_log: yes
|
||||
ipareplica_master_password:
|
||||
dm_password: "{{ ipadm_password }}"
|
||||
master_password: "{{ ipareplica_master_password | default(omit) }}"
|
||||
register: result_ipareplica_master_password
|
||||
|
||||
|
||||
Reference in New Issue
Block a user