Skip to content

Commit c6a9933

Browse files
committed
Convert DL Admin identity details to use Azure module
Signed-off-by: Webster Mudge <[email protected]>
1 parent 6107863 commit c6a9933

File tree

2 files changed

+12
-14
lines changed

2 files changed

+12
-14
lines changed

roles/data/tasks/initialize_azure.yml

Lines changed: 11 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -23,20 +23,18 @@
2323
ansible.builtin.set_fact:
2424
data__azure_metagroup_uri: "{{ __azure_resource_metagroup_info.resourcegroups[0].id | default('') }}"
2525

26-
- name: Query for the Azure Datalake Admin Identity
27-
command: "az identity list -g {{ data__azure_metagroup_name }}"
28-
register: __azure_identity_list
29-
failed_when: __azure_identity_list.rc != 0
30-
delay: 5
31-
retries: 10
32-
until:
33-
- data__azure_datalakeadmin_identity_name in ( __azure_identity_list.stdout | from_json | community.general.json_query('[*].name') )
34-
35-
- name: Extract Azure Identity Principals
26+
- name: Retrieve Azure Datalake Admin Identity
27+
azure.azcollection.azure_rm_resource_info:
28+
resource_group: "{{ data__azure_metagroup_name }}"
29+
provider: ManagedIdentity
30+
resource_type: userAssignedIdentities
31+
resource_name: "{{ data__azure_datalakeadmin_identity_name }}"
32+
#api_version: '2018-11-30'
33+
register: __azure_dl_admin_identity
34+
35+
- name: Set fact Azure Datalake Admin Principal details
3636
ansible.builtin.set_fact:
37-
__azure_datalakeadmin_identity_uuid: "{{ __azure_identity_list.stdout | from_json | community.general.json_query(jq_dtadmin_uuid) | first }}"
38-
vars:
39-
jq_dtadmin_uuid: "[?name=='{{ data__azure_datalakeadmin_identity_name }}'].principalId"
37+
__azure_datalakeadmin_identity: "{{ __azure_dl_admin_identity.response | selectattr('name', 'eq', data__azure_datalakeadmin_identity_name) | first }}"
4038

4139
- name: Retrieve Storage Blob Data Owner Role definition
4240
azure_rm_roledefinition_info:

roles/data/tasks/setup_azure_data_locations.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,5 +40,5 @@
4040
entry:
4141
name: "{{ __azure_data_location_assignment_name | to_uuid }}"
4242
scope: "{{ __azure_data_location_metagroup_uri }}/providers/Microsoft.Storage/storageAccounts/{{ __data_store_azure_location.storage_account }}/blobServices/default/containers/{{ __data_store_azure_location.container }}"
43-
assignee: "{{ __azure_datalakeadmin_identity_uuid }}"
43+
assignee: "{{ __azure_datalakeadmin_identity.properties.principalId }}"
4444
desc: external data location assignment

0 commit comments

Comments
 (0)