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
Sacha Brants
infra-azure-provisioning
Commits
7280f180
Commit
7280f180
authored
Nov 17, 2020
by
Daniel Scholl
Browse files
Bug fix airflow MR with missed changes
parent
a8786cdb
Changes
2
Hide whitespace changes
Inline
Side-by-side
infra/templates/osdu-r3-mvp/service_resources/airflow.tf
View file @
7280f180
...
...
@@ -25,8 +25,8 @@
# Airflow
#-------------------------------
locals
{
airflow_admin_password
=
coalesce
(
var
.
airflow_admin_password
,
random_password
.
airflow_admin_password
[
0
].
result
)
airflow_log_queue_name
=
"airflowlogqueue"
airflow_admin_password
=
coalesce
(
var
.
airflow_admin_password
,
random_password
.
airflow_admin_password
[
0
].
result
)
airflow_log_queue_name
=
"airflowlogqueue"
}
resource
"random_password"
"airflow_admin_password"
{
...
...
@@ -75,22 +75,22 @@ resource "azurerm_storage_share" "airflow_share" {
}
resource
"azurerm_storage_share_directory"
"dags"
{
name
=
"dags"
share_name
=
azurerm_storage_share
.
airflow_share
.
name
storage_account_name
=
module
.
storage_account
.
name
name
=
"dags"
share_name
=
azurerm_storage_share
.
airflow_share
.
name
storage_account_name
=
module
.
storage_account
.
name
}
resource
"azurerm_storage_share_directory"
"plugins"
{
name
=
"plugins"
share_name
=
azurerm_storage_share
.
airflow_share
.
name
storage_account_name
=
module
.
storage_account
.
name
name
=
"plugins"
share_name
=
azurerm_storage_share
.
airflow_share
.
name
storage_account_name
=
module
.
storage_account
.
name
}
resource
"azurerm_storage_share_directory"
"operators"
{
name
=
"plugins/operators"
share_name
=
azurerm_storage_share
.
airflow_share
.
name
storage_account_name
=
module
.
storage_account
.
name
depends_on
=
[
azurerm_storage_share_directory
.
plugins
]
name
=
"plugins/operators"
share_name
=
azurerm_storage_share
.
airflow_share
.
name
storage_account_name
=
module
.
storage_account
.
name
depends_on
=
[
azurerm_storage_share_directory
.
plugins
]
}
// Airflow log container
...
...
infra/templates/osdu-r3-mvp/service_resources/tests/unit/unit_test.go
View file @
7280f180
...
...
@@ -49,7 +49,7 @@ func TestTemplate(t *testing.T) {
TfOptions
:
tfOptions
,
Workspace
:
workspace
,
PlanAssertions
:
nil
,
ExpectedResourceCount
:
8
5
,
ExpectedResourceCount
:
8
8
,
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