From 5f7926b69c0ac1c874e81aa80df23f364c8d77b7 Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Wed, 21 Oct 2020 12:01:51 -0500 Subject: [PATCH 1/2] Bug fixes for manual setup --- README.md | 13 +++++++------ infra/templates/osdu-r3-mvp/data_partition/main.tf | 2 ++ 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index cdb2dc7f..ea0a9652 100644 --- a/README.md +++ b/README.md @@ -198,17 +198,18 @@ Infrastructure requires a bring your own Elastic Search Instance of a version of ES_ENDPOINT="" ES_USERNAME="" ES_PASSWORD="" -az keyvault secret set --vault-name $COMMON_VAULT --name "elastic-endpoint-dp1-demo" --value $ES_ENDPOINT -az keyvault secret set --vault-name $COMMON_VAULT --name "elastic-username-dp1-demo" --value $ES_USERNAME -az keyvault secret set --vault-name $COMMON_VAULT --name "elastic-password-dp1-demo" --value $ES_PASSWORD +az keyvault secret set --vault-name $COMMON_VAULT --name "elastic-endpoint-dp1-${UNIQUE}" --value $ES_ENDPOINT +az keyvault secret set --vault-name $COMMON_VAULT --name "elastic-username-dp1-${UNIQUE}" --value $ES_USERNAME +az keyvault secret set --vault-name $COMMON_VAULT --name "elastic-password-dp1-${UNIQUE}" --value $ES_PASSWORD + cat >> .envrc << EOF # https://cloud.elastic.co # ------------------------------------------------------------------------------------------------------ -export TF_VAR_elasticsearch_endpoint="$(az keyvault secret show --id https://$COMMON_VAULT.vault.azure.net/secrets/elastic-endpoint-dp1-demo --query value -otsv)" -export TF_VAR_elasticsearch_username="$(az keyvault secret show --id https://$COMMON_VAULT.vault.azure.net/secrets/elastic-username-dp1-demo --query value -otsv)" -export TF_VAR_elasticsearch_password="$(az keyvault secret show --id https://$COMMON_VAULT.vault.azure.net/secrets/elastic-password-dp1-demo --query value -otsv)" +export TF_VAR_elasticsearch_endpoint="$ES_ENDPOINT" +export TF_VAR_elasticsearch_username="$ES_USERNAME" +export TF_VAR_elasticsearch_password="$ES_PASSWORD" EOF diff --git a/infra/templates/osdu-r3-mvp/data_partition/main.tf b/infra/templates/osdu-r3-mvp/data_partition/main.tf index 5ca2db87..4bc433c4 100644 --- a/infra/templates/osdu-r3-mvp/data_partition/main.tf +++ b/infra/templates/osdu-r3-mvp/data_partition/main.tf @@ -171,6 +171,7 @@ resource "azurerm_role_assignment" "storage_access" { // Add Data Contributor Role to Principal resource "azurerm_role_assignment" "storage_data_contributor" { count = length(local.rbac_principals) + depends_on = [azurerm_role_assignment.storage_access] role_definition_name = "Storage Blob Data Contributor" principal_id = local.rbac_principals[count.index] @@ -201,6 +202,7 @@ resource "azurerm_role_assignment" "sdms_storage_access" { // Add Data Contributor Role to Principal resource "azurerm_role_assignment" "sdms_storage_data_contributor" { count = length(local.rbac_principals) + depends_on = [azurerm_role_assignment.sdms_storage_access] role_definition_name = "Storage Blob Data Contributor" principal_id = local.rbac_principals[count.index] -- GitLab From 07cd8025e9d36144238ae0ca29e4a8c6a7217aaf Mon Sep 17 00:00:00 2001 From: Daniel Scholl Date: Wed, 21 Oct 2020 12:42:03 -0500 Subject: [PATCH 2/2] Updated a note for helm repo update --- infra/templates/osdu-r3-mvp/service_resources/README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/infra/templates/osdu-r3-mvp/service_resources/README.md b/infra/templates/osdu-r3-mvp/service_resources/README.md index 65f4826c..e32a6bb0 100644 --- a/infra/templates/osdu-r3-mvp/service_resources/README.md +++ b/infra/templates/osdu-r3-mvp/service_resources/README.md @@ -49,6 +49,8 @@ storage_queues = [ "airflowlogqueue" ] __Provision__ +> Please run `helm repo update` prior to executing in case you have helm charts locally that need updates. + Execute the following commands to set up your terraform workspace. ```bash -- GitLab