Skip to content

Commit 8c045df

Browse files
cmperroChris Perro
authored andcommitted
Update role assignment names to be unique per run, cause Azure likes that. And catch error in role assignment if the role has already been assigned, because that module still isn't idempotent. And good things are idempotent
Signed-off-by: Chris Perro <[email protected]>
1 parent 8582f67 commit 8c045df

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

roles/platform/tasks/setup_azure_authz.yml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -314,4 +314,11 @@
314314
loop_control:
315315
loop_var: __azure_rl_assgn_item
316316
label: "{{ __azure_rl_assgn_item.desc }}"
317+
<<<<<<< HEAD
317318
>>>>>>> 374439c (Updates to authz setup and teardown for deleting custom role, and scoping ad app down to the rg)
319+
=======
320+
failed_when:
321+
- "'rc' in __infra_az_sp_assign_result"
322+
- __infra_az_sp_assign_result.rc != 0
323+
- "'The role assignment already exists' not in __infra_az_sp_assign_result.module_stderr"
324+
>>>>>>> 397f597 (Update role assignment names to be unique per run, cause Azure likes that. And catch error in role assignment if the role has already been assigned, because that module still isn't idempotent. And good things are idempotent)

0 commit comments

Comments
 (0)