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/06 13:09:19 UTC
[incubator-datalab] 01/06: [DATALAB-1408]: fixed container name
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 9f9d1045d700c6c50ca1da40bde8feadbd5610a9
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Sep 6 11:19:27 2022 +0300
[DATALAB-1408]: fixed container name
---
.../scripts/azure/dataengine-service_create.py | 2 ++
.../scripts/azure/dataengine-service_prepare.py | 19 +++++++++----------
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_create.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_create.py
index 7b7af60b0..fe93fc030 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_create.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_create.py
@@ -48,10 +48,12 @@ parser.add_argument('--tags', type=str, help='')
parser.add_argument('--public_key', type=str, help='')
args = parser.parse_args()
+
def build_hdinsight_cluster(resource_group_name, cluster_name, params):
logging.info("Will be created cluster: {}".format(cluster_name))
return datalab.actions_lib.AzureActions().create_hdinsight_cluster(resource_group_name, cluster_name, params)
+
def create_cluster_parameters(location, tags, cluster_version, cluster_login_username, password, master_instance_type,
worker_count, worker_instance_type, storage_account_name, storage_account_key,
container_name, public_key):
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 2f47d74ca..d69929508 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine-service_prepare.py
@@ -77,15 +77,14 @@ if __name__ == "__main__":
hdinsight_conf['release_label'] = os.environ['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'],
- hdinsight_conf['project_name'],
- hdinsight_conf['endpoint_name'],
- hdinsight_conf['cluster_name'])).lower()
- hdinsight_conf['storage_account_name_tag'] = ('{0}-{1}-{2}-{3}-bucket'.format(hdinsight_conf['service_base_name'],
- hdinsight_conf['project_name'],
- hdinsight_conf['endpoint_name'],
- hdinsight_conf['cluster_name']
- )).lower()
+ hdinsight_conf['container_name'] = ('{0}-bucket'.format(hdinsight_conf['service_base_name'],
+ hdinsight_conf['project_name'],
+ hdinsight_conf['endpoint_name'],
+ hdinsight_conf['cluster_name'])).lower()
+ hdinsight_conf['storage_account_name_tag'] = ('{0}-bucket'.format(hdinsight_conf['service_base_name'],
+ hdinsight_conf['project_name'],
+ hdinsight_conf['endpoint_name'],
+ hdinsight_conf['cluster_name'])).lower()
hdinsight_conf['storage_account_tags'] = {"Name": hdinsight_conf['storage_account_name_tag'],
"SBN": hdinsight_conf['service_base_name'],
"project_tag": hdinsight_conf['project_name'],
@@ -125,7 +124,7 @@ if __name__ == "__main__":
"--cluster_version {} --location {} " \
"--master_instance_type {} --worker_instance_type {} " \
"--worker_count {} --storage_account_name {} " \
- "--storage_account_key {} --container_name {} " \
+ "--storage_account_key '{}' --container_name {} " \
"--tags '{}' --public_key '{}'"\
.format(hdinsight_conf['resource_group_name'], hdinsight_conf['cluster_name'],
hdinsight_conf['release_label'], hdinsight_conf['region'],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org