Merge pull request #381 from automationiberia/minor-fixes

Changed path directory user filetree-read and change var drop_user_ex…
redhat-cop · Oct 11, 2022 · 05ee872 · 05ee872
2 parents fa1b0b3 + cb7beee
commit 05ee872
Show file tree

Hide file tree

Showing 97 changed files with 76 additions and 6 deletions.
diff --git a/...ntroller_credential_types_aap_monitor.yml → ...ntroller_credential_types_aap_monitor.yml b/...ntroller_credential_types_aap_monitor.yml → ...ntroller_credential_types_aap_monitor.yml
diff --git a/.../controller_credential_types_acme_key.yml → .../controller_credential_types_acme_key.yml b/.../controller_credential_types_acme_key.yml → .../controller_credential_types_acme_key.yml
diff --git a/...ontroller_credential_types_cloudforms.yml → ...ontroller_credential_types_cloudforms.yml b/...ontroller_credential_types_cloudforms.yml → ...ontroller_credential_types_cloudforms.yml
diff --git a/.../controller_credential_types_multiple.yml → .../controller_credential_types_multiple.yml b/.../controller_credential_types_multiple.yml → .../controller_credential_types_multiple.yml
diff --git a/...ontroller_credential_types_servicenow.yml → ...ontroller_credential_types_servicenow.yml b/...ontroller_credential_types_servicenow.yml → ...ontroller_credential_types_servicenow.yml
diff --git a/...l_types.d/controller_credential_types.yml → ...l_types.d/controller_credential_types.yml b/...l_types.d/controller_credential_types.yml → ...l_types.d/controller_credential_types.yml
diff --git a/...controller_groups.d/controller_groups.yml → ...controller_groups.d/controller_groups.yml b/...controller_groups.d/controller_groups.yml → ...controller_groups.d/controller_groups.yml
diff --git a/...ample/controller_instance_groups_otlc.yml → ...ample/controller_instance_groups_otlc.yml b/...ample/controller_instance_groups_otlc.yml → ...ample/controller_instance_groups_otlc.yml
diff --git a/...e_groups.d/controller_instance_groups.yml → ...e_groups.d/controller_instance_groups.yml b/...e_groups.d/controller_instance_groups.yml → ...e_groups.d/controller_instance_groups.yml
diff --git a/...casc/controller_inventories_localhost.yml → ...casc/controller_inventories_localhost.yml b/...casc/controller_inventories_localhost.yml → ...casc/controller_inventories_localhost.yml
diff --git a/...-example/controller_inventories_excel.yml → ...-example/controller_inventories_excel.yml b/...-example/controller_inventories_excel.yml → ...-example/controller_inventories_excel.yml
diff --git a/...ple/controller_inventories_smart_org1.yml → ...ple/controller_inventories_smart_org1.yml b/...ple/controller_inventories_smart_org1.yml → ...ple/controller_inventories_smart_org1.yml
diff --git a/...ple/controller_inventories_smart_org2.yml → ...ple/controller_inventories_smart_org2.yml b/...ple/controller_inventories_smart_org2.yml → ...ple/controller_inventories_smart_org2.yml
diff --git a/..._inventories.d/controller_inventories.yml → ..._inventories.d/controller_inventories.yml b/..._inventories.d/controller_inventories.yml → ..._inventories.d/controller_inventories.yml
diff --git a/...pp-casc/controller_job_templates_casc.yml → ...pp-casc/controller_job_templates_casc.yml b/...pp-casc/controller_job_templates_casc.yml → ...pp-casc/controller_job_templates_casc.yml
diff --git a/...roller_job_templates_container_groups.yml → ...roller_job_templates_container_groups.yml b/...roller_job_templates_container_groups.yml → ...roller_job_templates_container_groups.yml
diff --git a/...le/controller_job_templates_demo_push.yml → ...le/controller_job_templates_demo_push.yml b/...le/controller_job_templates_demo_push.yml → ...le/controller_job_templates_demo_push.yml
diff --git a/..._templates.d/controller_job_templates.yml → ..._templates.d/controller_job_templates.yml b/..._templates.d/controller_job_templates.yml → ..._templates.d/controller_job_templates.yml
diff --git a/...-casc/controller_organizations_Global.yml → ...-casc/controller_organizations_Global.yml b/...-casc/controller_organizations_Global.yml → ...-casc/controller_organizations_Global.yml
diff --git a/...e/controller_organizations_ExampleOrg.yml → ...e/controller_organizations_ExampleOrg.yml b/...e/controller_organizations_ExampleOrg.yml → ...e/controller_organizations_ExampleOrg.yml
diff --git a/...ontroller_organizations_OrgCrossTeams.yml → ...ontroller_organizations_OrgCrossTeams.yml b/...ontroller_organizations_OrgCrossTeams.yml → ...ontroller_organizations_OrgCrossTeams.yml
diff --git a/...roller_organizations_Organizations1-2.yml → ...roller_organizations_Organizations1-2.yml b/...roller_organizations_Organizations1-2.yml → ...roller_organizations_Organizations1-2.yml
diff --git a/...anizations.d/controller_organizations.yml → ...anizations.d/controller_organizations.yml b/...anizations.d/controller_organizations.yml → ...anizations.d/controller_organizations.yml
diff --git a/...s.d/app-casc/controller_projects_casc.yml → ...s.d/app-casc/controller_projects_casc.yml b/...s.d/app-casc/controller_projects_casc.yml → ...s.d/app-casc/controller_projects_casc.yml
diff --git a/.../controller_projects_container_groups.yml → .../controller_projects_container_groups.yml b/.../controller_projects_container_groups.yml → .../controller_projects_container_groups.yml
diff --git a/...roller_projects.d/controller_projects.yml → ...roller_projects.d/controller_projects.yml b/...roller_projects.d/controller_projects.yml → ...roller_projects.d/controller_projects.yml
diff --git a/...roller_projects_inventory_sourcea_dev.yml → ...roller_projects_inventory_sourcea_dev.yml b/...roller_projects_inventory_sourcea_dev.yml → ...roller_projects_inventory_sourcea_dev.yml
diff --git a/...oller_projects_inventory_sourcea_prod.yml → ...oller_projects_inventory_sourcea_prod.yml b/...oller_projects_inventory_sourcea_prod.yml → ...oller_projects_inventory_sourcea_prod.yml
diff --git a/...roller_projects_inventory_sourceb_dev.yml → ...roller_projects_inventory_sourceb_dev.yml b/...roller_projects_inventory_sourceb_dev.yml → ...roller_projects_inventory_sourceb_dev.yml
diff --git a/...oller_projects_inventory_sourceb_prod.yml → ...oller_projects_inventory_sourceb_prod.yml b/...oller_projects_inventory_sourceb_prod.yml → ...oller_projects_inventory_sourceb_prod.yml
diff --git a/...ample/controller_roles_cmdb_approvals.yml → ...ample/controller_roles_cmdb_approvals.yml b/...ample/controller_roles_cmdb_approvals.yml → ...ample/controller_roles_cmdb_approvals.yml
diff --git a/...-example/controller_roles_inventories.yml → ...-example/controller_roles_inventories.yml b/...-example/controller_roles_inventories.yml → ...-example/controller_roles_inventories.yml
diff --git a/.../controller_roles_inventory_wf_update.yml → .../controller_roles_inventory_wf_update.yml b/.../controller_roles_inventory_wf_update.yml → .../controller_roles_inventory_wf_update.yml
diff --git a/....d/app-example/controller_roles_teams.yml → ....d/app-example/controller_roles_teams.yml b/....d/app-example/controller_roles_teams.yml → ....d/app-example/controller_roles_teams.yml
diff --git a/....d/app-example/controller_roles_users.yml → ....d/app-example/controller_roles_users.yml b/....d/app-example/controller_roles_users.yml → ....d/app-example/controller_roles_users.yml
diff --git a/...n/controller_roles.d/controller_roles.yml → ...n/controller_roles.d/controller_roles.yml b/...n/controller_roles.d/controller_roles.yml → ...n/controller_roles.d/controller_roles.yml
diff --git a/....d/app-casc/controller_schedules_casc.yml → ....d/app-casc/controller_schedules_casc.yml b/....d/app-casc/controller_schedules_casc.yml → ....d/app-casc/controller_schedules_casc.yml
diff --git a/...-example/controller_schedules_example.yml → ...-example/controller_schedules_example.yml b/...-example/controller_schedules_example.yml → ...-example/controller_schedules_example.yml
diff --git a/...ller_schedules.d/controller_schedules.yml → ...ller_schedules.d/controller_schedules.yml b/...ller_schedules.d/controller_schedules.yml → ...ller_schedules.d/controller_schedules.yml
diff --git a/...eams.d/app-demo/controller_teams_org1.yml → ...eams.d/app-demo/controller_teams_org1.yml b/...eams.d/app-demo/controller_teams_org1.yml → ...eams.d/app-demo/controller_teams_org1.yml
diff --git a/...eams.d/app-demo/controller_teams_org2.yml → ...eams.d/app-demo/controller_teams_org2.yml b/...eams.d/app-demo/controller_teams_org2.yml → ...eams.d/app-demo/controller_teams_org2.yml
diff --git a/...n/controller_teams.d/controller_teams.yml → ...n/controller_teams.d/controller_teams.yml b/...n/controller_teams.d/controller_teams.yml → ...n/controller_teams.d/controller_teams.yml
diff --git a/...ontroller_workflow_job_templates_casc.yml → ...ontroller_workflow_job_templates_casc.yml b/...ontroller_workflow_job_templates_casc.yml → ...ontroller_workflow_job_templates_casc.yml
diff --git a/...orkflow_job_templates_InventoryUpdate.yml → ...orkflow_job_templates_InventoryUpdate.yml b/...orkflow_job_templates_InventoryUpdate.yml → ...orkflow_job_templates_InventoryUpdate.yml
diff --git a/...s.d/controller_workflow_job_templates.yml → ...s.d/controller_workflow_job_templates.yml b/...s.d/controller_workflow_job_templates.yml → ...s.d/controller_workflow_job_templates.yml
diff --git a/...p-examples/controller_credentials_aap.yml → ...p-examples/controller_credentials_aap.yml b/...p-examples/controller_credentials_aap.yml → ...p-examples/controller_credentials_aap.yml
diff --git a/...xamples/controller_credentials_galaxy.yml → ...xamples/controller_credentials_galaxy.yml b/...xamples/controller_credentials_galaxy.yml → ...xamples/controller_credentials_galaxy.yml
diff --git a/...amples/controller_credentials_machine.yml → ...amples/controller_credentials_machine.yml b/...amples/controller_credentials_machine.yml → ...amples/controller_credentials_machine.yml
diff --git a/...p-examples/controller_credentials_ocp.yml → ...p-examples/controller_credentials_ocp.yml b/...p-examples/controller_credentials_ocp.yml → ...p-examples/controller_credentials_ocp.yml
diff --git a/...mples/controller_credentials_registry.yml → ...mples/controller_credentials_registry.yml b/...mples/controller_credentials_registry.yml → ...mples/controller_credentials_registry.yml
diff --git a/...p-examples/controller_credentials_scm.yml → ...p-examples/controller_credentials_scm.yml b/...p-examples/controller_credentials_scm.yml → ...p-examples/controller_credentials_scm.yml
diff --git a/...examples/controller_credentials_vault.yml → ...examples/controller_credentials_vault.yml b/...examples/controller_credentials_vault.yml → ...examples/controller_credentials_vault.yml
diff --git a/...roller_execution_environments_ee-casc.yml → ...roller_execution_environments_ee-casc.yml b/...roller_execution_environments_ee-casc.yml → ...roller_execution_environments_ee-casc.yml
diff --git a/...roller_execution_environments_ee-xlsx.yml → ...roller_execution_environments_ee-xlsx.yml b/...roller_execution_environments_ee-xlsx.yml → ...roller_execution_environments_ee-xlsx.yml
diff --git a/...s.d/controller_execution_environments.yml → ...s.d/controller_execution_environments.yml b/...s.d/controller_execution_environments.yml → ...s.d/controller_execution_environments.yml
diff --git a/...d/app-casc/controller_hosts_localhost.yml → ...d/app-casc/controller_hosts_localhost.yml b/...d/app-casc/controller_hosts_localhost.yml → ...d/app-casc/controller_hosts_localhost.yml
diff --git a/...v/controller_hosts.d/controller_hosts.yml → ...v/controller_hosts.d/controller_hosts.yml b/...v/controller_hosts.d/controller_hosts.yml → ...v/controller_hosts.d/controller_hosts.yml
diff --git a/...troller_inventory_sources_sourcea_dev.yml → ...troller_inventory_sources_sourcea_dev.yml b/...troller_inventory_sources_sourcea_dev.yml → ...troller_inventory_sources_sourcea_dev.yml
diff --git a/...roller_inventory_sources_sourcea_prod.yml → ...roller_inventory_sources_sourcea_prod.yml b/...roller_inventory_sources_sourcea_prod.yml → ...roller_inventory_sources_sourcea_prod.yml
diff --git a/...troller_inventory_sources_sourceb_dev.yml → ...troller_inventory_sources_sourceb_dev.yml b/...troller_inventory_sources_sourceb_dev.yml → ...troller_inventory_sources_sourceb_dev.yml
diff --git a/...roller_inventory_sources_sourceb_prod.yml → ...roller_inventory_sources_sourceb_prod.yml b/...roller_inventory_sources_sourceb_prod.yml → ...roller_inventory_sources_sourceb_prod.yml
diff --git a/...ources.d/controller_inventory_sources.yml → ...ources.d/controller_inventory_sources.yml b/...ources.d/controller_inventory_sources.yml → ...ources.d/controller_inventory_sources.yml
diff --git a/...app-examples/controller_settings_jobs.yml → ...app-examples/controller_settings_jobs.yml b/...app-examples/controller_settings_jobs.yml → ...app-examples/controller_settings_jobs.yml
diff --git a/...app-examples/controller_settings_ldap.yml → ...app-examples/controller_settings_ldap.yml b/...app-examples/controller_settings_ldap.yml → ...app-examples/controller_settings_ldap.yml
diff --git a/...p-examples/controller_settings_system.yml → ...p-examples/controller_settings_system.yml b/...p-examples/controller_settings_system.yml → ...p-examples/controller_settings_system.yml
diff --git a/...es/controller_settings_user_interface.yml → ...es/controller_settings_user_interface.yml b/...es/controller_settings_user_interface.yml → ...es/controller_settings_user_interface.yml
diff --git a/...roller_settings.d/controller_settings.yml → ...roller_settings.d/controller_settings.yml b/...roller_settings.d/controller_settings.yml → ...roller_settings.d/controller_settings.yml
diff --git a/...pp-demo/controller_user_accounts_org1.yml → ...pp-demo/controller_user_accounts_org1.yml b/...pp-demo/controller_user_accounts_org1.yml → ...pp-demo/controller_user_accounts_org1.yml
diff --git a/...pp-demo/controller_user_accounts_org2.yml → ...pp-demo/controller_user_accounts_org2.yml b/...pp-demo/controller_user_accounts_org2.yml → ...pp-demo/controller_user_accounts_org2.yml
diff --git a/...ller_users.d/controller_user_accounts.yml → ...ller_users.d/controller_user_accounts.yml b/...ller_users.d/controller_user_accounts.yml → ...ller_users.d/controller_user_accounts.yml
diff --git a/...p-examples/controller_credentials_aap.yml → ...p-examples/controller_credentials_aap.yml b/...p-examples/controller_credentials_aap.yml → ...p-examples/controller_credentials_aap.yml
diff --git a/...xamples/controller_credentials_galaxy.yml → ...xamples/controller_credentials_galaxy.yml b/...xamples/controller_credentials_galaxy.yml → ...xamples/controller_credentials_galaxy.yml
diff --git a/...amples/controller_credentials_machine.yml → ...amples/controller_credentials_machine.yml b/...amples/controller_credentials_machine.yml → ...amples/controller_credentials_machine.yml
diff --git a/...p-examples/controller_credentials_ocp.yml → ...p-examples/controller_credentials_ocp.yml b/...p-examples/controller_credentials_ocp.yml → ...p-examples/controller_credentials_ocp.yml
diff --git a/...mples/controller_credentials_registry.yml → ...mples/controller_credentials_registry.yml b/...mples/controller_credentials_registry.yml → ...mples/controller_credentials_registry.yml
diff --git a/...p-examples/controller_credentials_scm.yml → ...p-examples/controller_credentials_scm.yml b/...p-examples/controller_credentials_scm.yml → ...p-examples/controller_credentials_scm.yml
diff --git a/...examples/controller_credentials_vault.yml → ...examples/controller_credentials_vault.yml b/...examples/controller_credentials_vault.yml → ...examples/controller_credentials_vault.yml
diff --git a/...roller_execution_environments_ee-casc.yml → ...roller_execution_environments_ee-casc.yml b/...roller_execution_environments_ee-casc.yml → ...roller_execution_environments_ee-casc.yml
diff --git a/...roller_execution_environments_ee-xlsx.yml → ...roller_execution_environments_ee-xlsx.yml b/...roller_execution_environments_ee-xlsx.yml → ...roller_execution_environments_ee-xlsx.yml
diff --git a/...s.d/controller_execution_environments.yml → ...s.d/controller_execution_environments.yml b/...s.d/controller_execution_environments.yml → ...s.d/controller_execution_environments.yml
diff --git a/...d/controller_hosts.d/controller_hosts.yml → ...d/controller_hosts.d/controller_hosts.yml b/...d/controller_hosts.d/controller_hosts.yml → ...d/controller_hosts.d/controller_hosts.yml
diff --git a/...troller_inventory_sources_sourcea_dev.yml → ...troller_inventory_sources_sourcea_dev.yml b/...troller_inventory_sources_sourcea_dev.yml → ...troller_inventory_sources_sourcea_dev.yml
diff --git a/...roller_inventory_sources_sourcea_prod.yml → ...roller_inventory_sources_sourcea_prod.yml b/...roller_inventory_sources_sourcea_prod.yml → ...roller_inventory_sources_sourcea_prod.yml
diff --git a/...troller_inventory_sources_sourceb_dev.yml → ...troller_inventory_sources_sourceb_dev.yml b/...troller_inventory_sources_sourceb_dev.yml → ...troller_inventory_sources_sourceb_dev.yml
diff --git a/...roller_inventory_sources_sourceb_prod.yml → ...roller_inventory_sources_sourceb_prod.yml b/...roller_inventory_sources_sourceb_prod.yml → ...roller_inventory_sources_sourceb_prod.yml
diff --git a/...ources.d/controller_inventory_sources.yml → ...ources.d/controller_inventory_sources.yml b/...ources.d/controller_inventory_sources.yml → ...ources.d/controller_inventory_sources.yml
diff --git a/...app-examples/controller_settings_jobs.yml → ...app-examples/controller_settings_jobs.yml b/...app-examples/controller_settings_jobs.yml → ...app-examples/controller_settings_jobs.yml
diff --git a/...app-examples/controller_settings_ldap.yml → ...app-examples/controller_settings_ldap.yml b/...app-examples/controller_settings_ldap.yml → ...app-examples/controller_settings_ldap.yml
diff --git a/...p-examples/controller_settings_system.yml → ...p-examples/controller_settings_system.yml b/...p-examples/controller_settings_system.yml → ...p-examples/controller_settings_system.yml
diff --git a/...es/controller_settings_user_interface.yml → ...es/controller_settings_user_interface.yml b/...es/controller_settings_user_interface.yml → ...es/controller_settings_user_interface.yml
diff --git a/...roller_settings.d/controller_settings.yml → ...roller_settings.d/controller_settings.yml b/...roller_settings.d/controller_settings.yml → ...roller_settings.d/controller_settings.yml
diff --git a/...gs_vars/ExampleOrg/env/prod/controller_users.d/app-demo/controller_user_accounts_org1.yml b/...gs_vars/ExampleOrg/env/prod/controller_users.d/app-demo/controller_user_accounts_org1.yml
@@ -0,0 +1,28 @@
+---
+controller_user_accounts:
+- username: "adminorg1"
+  password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          34326232313533313332653164303739356639666566613232363234316333646630313830316639
+          6666613666393831356637353834343733626132336361300a333836633636356338383038623034
+          31633639323635333835393662346566303037633834313561666166653232376238623461626138
+          6163663536373538390a393763316538313133313363346466666264386334383638336133366465
+          3130
+  email: "[email protected]"
+  firstname: "adminorg1"
+  lastname: "adminorg1"
+  is_auditor: False
+  is_superuser: False
+
+- username: "userorg1"
+  password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          34326232313533313332653164303739356639666566613232363234316333646630313830316639
+          6666613666393831356637353834343733626132336361300a333836633636356338383038623034
+          31633639323635333835393662346566303037633834313561666166653232376238623461626138
+          6163663536373538390a393763316538313133313363346466666264386334383638336133366465
+          3130
+  email: "[email protected]"
+  is_superuser: False
+
+...
diff --git a/...gs_vars/ExampleOrg/env/prod/controller_users.d/app-demo/controller_user_accounts_org2.yml b/...gs_vars/ExampleOrg/env/prod/controller_users.d/app-demo/controller_user_accounts_org2.yml
@@ -0,0 +1,27 @@
+---
+controller_user_accounts:
+- username: "adminorg2"
+  password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          34326232313533313332653164303739356639666566613232363234316333646630313830316639
+          6666613666393831356637353834343733626132336361300a333836633636356338383038623034
+          31633639323635333835393662346566303037633834313561666166653232376238623461626138
+          6163663536373538390a393763316538313133313363346466666264386334383638336133366465
+          3130
+  email: "[email protected]"
+  firstname: "adminorg2"
+  lastname: "adminorg2"
+  is_auditor: False
+  is_superuser: False
+
+- username: "userorg2"
+  password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          34326232313533313332653164303739356639666566613232363234316333646630313830316639
+          6666613666393831356637353834343733626132336361300a333836633636356338383038623034
+          31633639323635333835393662346566303037633834313561666166653232376238623461626138
+          6163663536373538390a393763316538313133313363346466666264386334383638336133366465
+          3130
+  email: "[email protected]"
+  is_superuser: False
+...
diff --git a/...eautomation/orgs_vars/ExampleOrg/env/prod/controller_users.d/controller_user_accounts.yml b/...eautomation/orgs_vars/ExampleOrg/env/prod/controller_users.d/controller_user_accounts.yml
@@ -0,0 +1,17 @@
+---
+controller_user_accounts:
+- username: "admin"
+  password: !vault |
+          $ANSIBLE_VAULT;1.1;AES256
+          34326232313533313332653164303739356639666566613232363234316333646630313830316639
+          6666613666393831356637353834343733626132336361300a333836633636356338383038623034
+          31633639323635333835393662346566303037633834313561666166653232376238623461626138
+          6163663536373538390a393763316538313133313363346466666264386334383638336133366465
+          3130
+  email: "[email protected]"
+  firstname: "admin"
+  lastname: "admin"
+  is_auditor: False
+  is_superuser: True
+  update_secrets: False
+...
diff --git a/roles/filetree_read/defaults/main.yml b/roles/filetree_read/defaults/main.yml
@@ -34,7 +34,7 @@ controller_roles: []
 filetree_controller_settings: "{{ dir_orgs_vars }}/{{ orgs }}/env/{{ env }}/controller_settings.d/"
 filetree_controller_organizations: "{{ dir_orgs_vars }}/{{ orgs }}/env/common/controller_organizations.d/"
 filetree_controller_labels: "{{ dir_orgs_vars }}/{{ orgs }}/env/common/controller_labels.d/"
-filetree_controller_user_accounts: "{{ dir_orgs_vars }}/{{ orgs }}/env/common/controller_users.d/"
+filetree_controller_user_accounts: "{{ dir_orgs_vars }}/{{ orgs }}/env/{{ env }}/controller_users.d/"
 filetree_controller_teams: "{{ dir_orgs_vars }}/{{ orgs }}/env/common/controller_teams.d/"
 filetree_controller_credential_types: "{{ dir_orgs_vars }}/{{ orgs }}/env/common/controller_credential_types.d/"
 filetree_controller_credentials: "{{ dir_orgs_vars }}/{{ orgs }}/env/{{ env }}/controller_credentials.d/"

diff --git a/roles/object_diff/defaults/main.yml b/roles/object_diff/defaults/main.yml
@@ -2,7 +2,7 @@
 # defaults file for object_diff
 
 # populate_controller_api_user_accounts_without_external_accounts
-drop_user_external_accounts: true
+drop_user_external_accounts: false
 
 # Automation Controller Object Lists
 controller_settings: []

diff --git a/roles/object_diff/tasks/user_accounts.yml b/roles/object_diff/tasks/user_accounts.yml
@@ -7,7 +7,7 @@
                                                               host=controller_hostname, oauth_token=controller_oauthtoken, verify_ssl=controller_validate_certs)
                                                    }}"
 
-- name: "OBJECT DIFF: Sets the current controller user to determine if it is super-admin"
+- name: "OBJECT DIFF: Get all users from the API"
   ansible.builtin.set_fact:
     __controller_api_user_accounts: "{{ query(controller_api_plugin, 'users',
                                               host=controller_hostname, oauth_token=controller_oauthtoken, verify_ssl=controller_validate_certs)
@@ -24,9 +24,7 @@
         __controller_api_user_accounts: "{{ populate_controller_api_user_accounts_without_external_accounts }}"
       when: populate_controller_api_user_accounts_without_external_accounts is defined
 
-  when:
-    - drop_user_external_accounts is defined
-    - drop_user_external_accounts
+  when: not drop_user_external_accounts
 
 - name: "User account differences (block)"
   block: