Skip to content

Commit

Permalink
Fix - Azure AD users (#74)
Browse files Browse the repository at this point in the history
* Add keyvault RBAC support

* Role_mapping structure update. Require to adjust the config structure

* Add landingzone key to example caf module

* Update pipeline and default settings

* Change examples pipelines

* Fix modules for examples

* Fix example policy dependencies

* Update README

* Update remote resources support

* Update timeout for role propagation
Update peering for remote vnet support

* Update rover for ci

* Update azure caf name for msi, private vnet ling and ase

* Fix examples for app_services to remote remote lz

* Update remote

* Fix AzureAD for remote lz support

Co-authored-by: Arnaud Lheureux <[email protected]>
  • Loading branch information
LaurentLesle and arnaudlh authored Oct 21, 2020
1 parent 5ad35a7 commit 4cac978
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 1 deletion.
1 change: 1 addition & 0 deletions azuread.tf
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@ module azuread_users {
for_each = var.azuread_users

global_settings = local.global_settings
client_config = local.client_config
azuread_users = each.value
keyvaults = local.combined_objects_keyvaults
}
Expand Down
2 changes: 1 addition & 1 deletion modules/azuread/users/main.tf
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ data "azuread_domains" "aad_domains" {
locals {
user_name = var.azuread_users.user_name
tenant_name = lookup(var.azuread_users, "tenant_name", data.azuread_domains.aad_domains.domains[0].domain_name)
keyvault_id = var.keyvaults[var.azuread_users.keyvault_key].id
keyvault_id = var.keyvaults[var.client_config.landingzone_key][var.azuread_users.keyvault_key].id
secret_prefix = lookup(var.azuread_users, "secret_prefix", "")
password_expire_in_days = lookup(var.azuread_users, "password_expire_in_days", 180)

Expand Down
1 change: 1 addition & 0 deletions modules/azuread/users/variables.tf
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
variable global_settings {}
variable client_config {}
variable azuread_users {}
variable keyvaults {}

0 comments on commit 4cac978

Please sign in to comment.