You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2022/09/02 13:55:15 UTC
[incubator-datalab] 01/02: [DATALAB-1408]: fixed some variables
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-1408
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit e90c725fbf7d327e72c0fe9ece9fffa905ede9dd
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Sep 2 14:28:57 2022 +0300
[DATALAB-1408]: fixed some variables
---
infrastructure-provisioning/src/general/conf/datalab.ini | 2 ++
.../src/general/scripts/azure/dataengine-service_prepare.py | 8 ++++----
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/conf/datalab.ini b/infrastructure-provisioning/src/general/conf/datalab.ini
index 6a79fe1a5..f4e80dc67 100644
--- a/infrastructure-provisioning/src/general/conf/datalab.ini
+++ b/infrastructure-provisioning/src/general/conf/datalab.ini
@@ -218,6 +218,8 @@ locale = en-US
datalake_enable = false
### Azure login application ID
# application_id =
+### Azure HDinsight version
+hdinsight_version = 4.0
[gcp]
### GCP project ID
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_prepare.py
index 50049fc70..0dec95979 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_prepare.py
@@ -53,7 +53,7 @@ if __name__ == "__main__":
hdinsight_conf['computational_name'] = os.environ['computational_name'].replace('_', '-').lower()
else:
hdinsight_conf['computational_name'] = ''
-
+ hdinsight_conf['hdinsight_worker_count'] = int(os.environ['dataengine_instance_count']) - 2
hdinsight_conf['service_base_name'] = (os.environ['conf_service_base_name'])
hdinsight_conf['project_name'] = (os.environ['project_name']).replace('_', '-').lower()
hdinsight_conf['endpoint_name'] = (os.environ['endpoint_name']).replace('_', '-').lower()
@@ -77,7 +77,7 @@ if __name__ == "__main__":
"endpoint": hdinsight_conf['endpoint_name']
}
- hdinsight_conf['release_label'] = os.environ['hdinsight_version']
+ hdinsight_conf['release_label'] = os.environ['azure_hdinsight_version']
key = RSA.importKey(open(hdinsight_conf['key_path'], 'rb').read())
ssh_admin_pubkey = key.publickey().exportKey("OpenSSH").decode('UTF-8')
hdinsight_conf['container_name'] = ('{0}-{1}-{2}-{3}-bucket'.format(hdinsight_conf['service_base_name'],
@@ -132,8 +132,8 @@ if __name__ == "__main__":
"--tags '{}' --public_key {}"\
.format(hdinsight_conf['resource_group_name'], hdinsight_conf['cluster_name'],
hdinsight_conf['release_label'], hdinsight_conf['region'],
- os.environ['hdinsight_master_instance_type'], os.environ['hdinsight_slave_instance_type'],
- os.environ['hdinsight_slave_count'], hdinsight_conf['storage_account_name'],
+ os.environ['azure_dataengine_master_size'], os.environ['azure_dataengine_slave_size'],
+ hdinsight_conf['hdinsight_worker_count'], hdinsight_conf['storage_account_name'],
hdinsight_conf['storage_account_key'], hdinsight_conf['container_name'],
json.dumps(hdinsight_conf['cluster_tags']), ssh_admin_pubkey)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org