Merge pull request #880 from t-woerner/flake8_ipavault_fix

ipavault: Fix missing whitespace after keyword issue
Merge pull request #877 from t-woerner/ipareplica_fix_ipaNTFlatName_update_issue
2026-03-27 05:43:05 +00:00 · 2022-08-16 17:34:32 +05:30 · 2022-08-16 17:31:40 +05:30 · 2022-08-16 10:18:03 +02:00 · 2022-08-15 16:17:57 +02:00
2 changed files with 2 additions and 1 deletions
--- a/plugins/modules/ipavault.py
+++ b/plugins/modules/ipavault.py
@@ -525,7 +525,7 @@ def check_encryption_params(  # pylint: disable=unused-argument

        if (
            salt is not None
-            and not(
+            and not (
                any([password, password_file])
                and any([new_password, new_password_file])
            )
--- a/roles/ipareplica/tasks/install.yml
+++ b/roles/ipareplica/tasks/install.yml
@@ -201,6 +201,7 @@
      ### additional ###
      server: "{{ result_ipareplica_test.server }}"
      skip_conncheck: "{{ ipareplica_skip_conncheck }}"
+      sid_generation_always: "{{ result_ipareplica_test.sid_generation_always }}"
    register: result_ipareplica_prepare

  - name: Install - Add to ipaservers
Author	SHA1	Message	Date
Varun Mylaraiah	a3a7ecd817	Merge pull request #880 from t-woerner/flake8_ipavault_fix ipavault: Fix missing whitespace after keyword issue	2022-08-16 17:34:32 +05:30
Varun Mylaraiah	63f016226c	Merge pull request #877 from t-woerner/ipareplica_fix_ipaNTFlatName_update_issue ipareplica: ipareplica_setup_adtrust fails while updating ipaNTFlatName	2022-08-16 17:31:40 +05:30
Thomas Woerner	a58f61792b	ipavault: Fix missing whitespace after keyword issue flake8 reports an issue in ipavault: plugins/modules/ipavault.py:528:20: E275 missing whitespace after keyword The missing whitespace has been added: "and not(" -> "and not ("	2022-08-16 10:18:03 +02:00
Thomas Woerner	641c550cc3	ipareplica: ipareplica_setup_adtrust fails while updating ipaNTFlatName The internal parameter sid_generation_always is generated in ipareplica_test to enable SID generation if ipareplica_setup_adtrust is not enabled. This parameter was not used for ipareplica_prepare though, therefore adtrust.install_check was not executed and did not set the attribute adtrust.netbios_name. As a result adtrust.netbios_name was None and the try to use this as the new NetBIOS domain name failed with an INVALID_SYNTAX error in adtrustinstance while executing ipareplica_setup_adtrust. This issue only occurs if SIDs are not enabled in the domain yet for example with an old deployment.	2022-08-15 16:17:57 +02:00