diff --git a/roles/ipareplica/library/ipareplica_master_password.py b/roles/ipareplica/library/ipareplica_master_password.py index 77f6f8ec02a32353c9f53204842256a8ba41b011..d458e66a186b0d8037e73e4f07dd03665b2ff0f6 100644 --- a/roles/ipareplica/library/ipareplica_master_password.py +++ b/roles/ipareplica/library/ipareplica_master_password.py @@ -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() diff --git a/roles/ipareplica/tasks/install.yml b/roles/ipareplica/tasks/install.yml index 9acf558fe9c205da77df57baa52657b78713e6c3..7c0a198f2d7fec17f4b8d2a9a9e9689ccd60166a 100644 --- a/roles/ipareplica/tasks/install.yml +++ b/roles/ipareplica/tasks/install.yml @@ -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