Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Fabien Bosquet
infra-azure-provisioning
Commits
d4217434
Commit
d4217434
authored
Oct 13, 2020
by
Daniel Scholl
Browse files
Bug Fixing pipelines for Infra
parent
2f7eef5c
Changes
4
Hide whitespace changes
Inline
Side-by-side
devops/infra-deploy-stage.yml
View file @
d4217434
...
...
@@ -92,6 +92,7 @@ jobs:
terraformWorkspacePrefix
:
${{ parameters.configuration.terraformWorkspacePrefix }}
-
template
:
tasks/tests-int.yml
condition
:
succeeded()
parameters
:
skip
:
${{ parameters.skipTests }}
...
...
infra/templates/osdu-r3-mvp/service_resources/secrets.tf
View file @
d4217434
...
...
@@ -143,11 +143,18 @@ resource "azurerm_key_vault_secret" "postgres_password" {
# Azure Redis Cache
#-------------------------------
locals
{
redis_hostname
=
"redis-hostname"
redis_password_name
=
"redis-password"
}
resource
"azurerm_key_vault_secret"
"redis_host"
{
name
=
local
.
redis_hostname
value
=
module
.
redis_cache
.
hostname
key_vault_id
=
data
.
terraform_remote_state
.
central_resources
.
outputs
.
keyvault_id
}
resource
"azurerm_key_vault_secret"
"redis_password"
{
name
=
local
.
redis_password_name
value
=
module
.
redis_cache
.
primary_access_key
key_vault_id
=
data
.
terraform_remote_state
.
central_resources
.
outputs
.
keyvault_id
}
\ No newline at end of file
}
infra/templates/osdu-r3-mvp/service_resources/terraform.tfvars
View file @
d4217434
...
...
@@ -32,8 +32,10 @@ storage_containers = [
"airflow-logs"
]
storage_shares = [
"airflowdags"
"airflowdags",
"unit",
"crs"
]
storage_queues = [
"airflowlogqueue"
]
\ No newline at end of file
]
infra/templates/osdu-r3-mvp/service_resources/tests/unit/unit_test.go
View file @
d4217434
...
...
@@ -49,7 +49,7 @@ func TestTemplate(t *testing.T) {
TfOptions
:
tfOptions
,
Workspace
:
workspace
,
PlanAssertions
:
nil
,
ExpectedResourceCount
:
8
2
,
ExpectedResourceCount
:
8
3
,
ExpectedResourceAttributeValues
:
resourceDescription
,
}
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment