This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1467
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1467 by this push:
new a295241 [DLAB-1467]: added datalake_enabled parameter
a295241 is described below
commit a29524147331bd590415603b20b2c81a12d9614d
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Feb 11 17:29:45 2020 +0200
[DLAB-1467]: added datalake_enabled parameter
---
.../src/general/scripts/aws/ssn_configure.py | 4 ----
.../src/general/scripts/azure/ssn_configure.py | 10 ----------
.../src/general/scripts/gcp/ssn_configure.py | 4 ----
.../terraform/bin/deploy/endpoint_fab.py | 4 ----
.../terraform/bin/deploy/provisioning.yml | 1 -
services/provisioning-service/provisioning.yml | 1 -
6 files changed, 24 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 99ebe0a..a4d6dbc 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -458,10 +458,6 @@ if __name__ == "__main__":
'value': ''
},
{
- 'key': 'AZURE_DATALAKE_ENABLED',
- 'value': ''
- },
- {
'key': 'GCP_PROJECT_ID',
'value': ''
},
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index d6081ea..02c4eaa 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -389,11 +389,6 @@ if __name__ == "__main__":
'key': 'AZURE_CLIENT_ID',
'value': ''
})
- cloud_params.append(
- {
- 'key': 'AZURE_DATALAKE_ENABLED',
- 'value': ''
- })
if os.environ['azure_oauth2_enabled'] == 'false':
ldap_login = 'true'
tenant_id =
json.dumps(AzureMeta().sp_creds['tenantId']).replace('"', '')
@@ -411,11 +406,6 @@ if __name__ == "__main__":
'key': 'AZURE_CLIENT_ID',
'value': os.environ['azure_application_id']
})
- cloud_params.append(
- {
- 'key': 'AZURE_DATALAKE_ENABLED',
- 'value': os.environ['azure_datalake_enable']
- })
tenant_id =
json.dumps(AzureMeta().sp_creds['tenantId']).replace('"', '')
subscription_id =
json.dumps(AzureMeta().sp_creds['subscriptionId']).replace('"', '')
datalake_application_id = os.environ['azure_application_id']
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index b23cf37..cc9f170 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -381,10 +381,6 @@ if __name__ == "__main__":
'value': ''
},
{
- 'key': 'AZURE_DATALAKE_ENABLED',
- 'value': ''
- },
- {
'key': 'GCP_PROJECT_ID',
'value': os.environ['gcp_project_id']
},
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 826c542..93642bc 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -437,10 +437,6 @@ def
configure_supervisor_endpoint(endpoint_keystore_password):
'value': args.azure_datalake_tag
},
{
- 'key': 'AZURE_DATALAKE_ENABLED',
- 'value': args.azure_datalake_enabled
- },
- {
'key': "AZURE_CLIENT_ID",
'value': args.azure_client_id
},
diff --git a/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
b/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
index 4d3210b..9d65fa2 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
+++ b/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
@@ -168,7 +168,6 @@ cloudProperties:
azureResourceGroupName: AZURE_RESOURCE_GROUP_NAME
ssnStorageAccountTagName: AZURE_SSN_STORAGE_ACCOUNT_TAG
sharedStorageAccountTagName: AZURE_SHARED_STORAGE_ACCOUNT_TAG
- datalakeEnabled: AZURE_DATALAKE_ENABLED
datalakeTagName: AZURE_DATALAKE_TAG
azureClientId: AZURE_CLIENT_ID
gcpProjectId: GCP_PROJECT_ID
diff --git a/services/provisioning-service/provisioning.yml
b/services/provisioning-service/provisioning.yml
index 5a1cc43..d234e43 100644
--- a/services/provisioning-service/provisioning.yml
+++ b/services/provisioning-service/provisioning.yml
@@ -119,7 +119,6 @@ cloudProperties:
azureResourceGroupName: AZURE_RESOURCE_GROUP_NAME
ssnStorageAccountTagName: AZURE_SSN_STORAGE_ACCOUNT_TAG
sharedStorageAccountTagName: AZURE_SHARED_STORAGE_ACCOUNT_TAG
- datalakeEnabled: AZURE_DATALAKE_ENABLED
datalakeTagName: AZURE_DATALAKE_TAG
azureClientId: AZURE_CLIENT_ID
gcpProjectId: GCP_PROJECT_ID
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]