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 ed9f676  [DLAB-1467]: added datalake_enabled parameter
     new 4349c4d  Merge remote-tracking branch 'origin/DLAB-1467' into DLAB-1467
ed9f676 is described below

commit ed9f67639dbdbebc8676f35a5e1390cc2fb5d69a
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Feb 11 13:20:24 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                       |  5 +++++
 .../terraform/bin/deploy/provisioning.yml                      |  1 +
 services/provisioning-service/provisioning.yml                 |  1 +
 6 files changed, 25 insertions(+)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index a4d6dbc..99ebe0a 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -458,6 +458,10 @@ 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 02c4eaa..d6081ea 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -389,6 +389,11 @@ 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('"', '')
@@ -406,6 +411,11 @@ 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 cc9f170..b23cf37 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -381,6 +381,10 @@ 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 9b4bb7e..826c542 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -437,6 +437,10 @@ 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
                 },
@@ -758,6 +762,7 @@ def init_args():
     parser.add_argument('--azure_ssn_storage_account_tag', type=str, 
default='')
     parser.add_argument('--azure_shared_storage_account_tag', type=str, 
default='')
     parser.add_argument('--azure_datalake_tag', type=str, default='')
+    parser.add_argument('--azure_datalake_enabled', type=str, default='')
     parser.add_argument('--azure_client_id', type=str, default='')
     parser.add_argument('--gcp_project_id', type=str, default='')
     parser.add_argument('--ldap_host', type=str, default='')
diff --git a/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml 
b/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
index 9d65fa2..4d3210b 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
+++ b/infrastructure-provisioning/terraform/bin/deploy/provisioning.yml
@@ -168,6 +168,7 @@ 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 d234e43..5a1cc43 100644
--- a/services/provisioning-service/provisioning.yml
+++ b/services/provisioning-service/provisioning.yml
@@ -119,6 +119,7 @@ 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]

Reply via email to