This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1546 by this push:
new faa4f12 [DLAB-1546]: added name convention changes
faa4f12 is described below
commit faa4f1222876691498d211e3f0b31fc219c24dcf
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Feb 27 15:22:11 2020 +0200
[DLAB-1546]: added name convention changes
---
.../scripts/aws/common_notebook_configure_dataengine-service.py | 2 +-
.../src/general/scripts/aws/dataengine_configure.py | 4 ++--
.../src/general/scripts/aws/dataengine_prepare.py | 4 ++--
.../src/general/scripts/azure/dataengine_configure.py | 4 ++--
.../src/general/scripts/azure/dataengine_prepare.py | 4 ++--
infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py | 4 ++--
6 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
index ffac740..0903610 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
@@ -85,7 +85,7 @@ if __name__ == "__main__":
print('[INSTALLING KERNELS INTO SPECIFIED NOTEBOOK]')
params = "--bucket {} --cluster_name {} --emr_version {} --keyfile {}
--notebook_ip {} --region {} " \
"--emr_excluded_spark_properties {} --project_name {}
--os_user {} --edge_hostname {} " \
- "'--proxy_port {} --scala_version {} --application {}
--pip_mirror {}" \
+ "--proxy_port {} --scala_version {} --application {}
--pip_mirror {}" \
.format(notebook_config['bucket_name'],
notebook_config['cluster_name'], os.environ['emr_version'],
notebook_config['key_path'],
notebook_config['notebook_ip'], os.environ['aws_region'],
os.environ['emr_excluded_spark_properties'],
os.environ['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
index eeb7422..5ce53f0 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
@@ -181,9 +181,9 @@ if __name__ == "__main__":
data_engine['slave_node_name'] = data_engine['cluster_name'] + '-s'
data_engine['master_size'] = os.environ['aws_dataengine_master_shape']
data_engine['slave_size'] = os.environ['aws_dataengine_slave_shape']
- data_engine['dataengine_master_security_group_name'] =
'{}-{}-{}-dataengine-master-sg' \
+ data_engine['dataengine_master_security_group_name'] =
'{}-{}-{}-de-master-sg' \
.format(data_engine['service_base_name'],
data_engine['project_name'], data_engine['endpoint_name'])
- data_engine['dataengine_slave_security_group_name'] =
'{}-{}-{}-dataengine-slave-sg' \
+ data_engine['dataengine_slave_security_group_name'] =
'{}-{}-{}-de-slave-sg' \
.format(data_engine['service_base_name'],
data_engine['project_name'], data_engine['endpoint_name'])
data_engine['tag_name'] = data_engine['service_base_name'] + '-tag'
tag = {"Key": data_engine['tag_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
index 3b66750..4613eb9 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
@@ -81,9 +81,9 @@ if __name__ == "__main__":
data_engine['slave_node_name'] =
'{}-s'.format(data_engine['cluster_name'])
data_engine['master_size'] = os.environ['aws_dataengine_master_shape']
data_engine['slave_size'] = os.environ['aws_dataengine_slave_shape']
- data_engine['dataengine_master_security_group_name'] =
'{}-{}-{}-dataengine-master-sg' \
+ data_engine['dataengine_master_security_group_name'] =
'{}-{}-{}-de-master-sg' \
.format(data_engine['service_base_name'],
data_engine['project_name'], data_engine['endpoint_name'])
- data_engine['dataengine_slave_security_group_name'] =
'{}-{}-{}-dataengine-slave-sg' \
+ data_engine['dataengine_slave_security_group_name'] =
'{}-{}-{}-de-slave-sg' \
.format(data_engine['service_base_name'],
data_engine['project_name'], data_engine['endpoint_name'])
data_engine['tag_name'] =
'{}-tag'.format(data_engine['service_base_name'])
tag = {"Key": data_engine['tag_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
index 15d68cf..557cc08 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
@@ -183,9 +183,9 @@ if __name__ == "__main__":
data_engine['private_subnet_cidr'] =
AzureMeta().get_subnet(data_engine['resource_group_name'],
data_engine['vpc_name'],
data_engine['private_subnet_name']).address_prefix
- data_engine['master_security_group_name'] =
'{}-{}-{}-dataengine-master-sg'.format(
+ data_engine['master_security_group_name'] =
'{}-{}-{}-de-master-sg'.format(
data_engine['service_base_name'], data_engine['project_name'],
data_engine['endpoint_name'])
- data_engine['slave_security_group_name'] =
'{}-{}-{}-dataengine-slave-sg'.format(
+ data_engine['slave_security_group_name'] =
'{}-{}-{}-de-slave-sg'.format(
data_engine['service_base_name'], data_engine['project_name'],
data_engine['endpoint_name'])
data_engine['cluster_name'] =
'{}-{}-{}-de-{}'.format(data_engine['service_base_name'],
data_engine['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
index 58fc584..df943a3 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
@@ -70,9 +70,9 @@ if __name__ == "__main__":
data_engine['private_subnet_cidr'] =
AzureMeta().get_subnet(data_engine['resource_group_name'],
data_engine['vpc_name'],
data_engine['private_subnet_name']).address_prefix
- data_engine['master_security_group_name'] =
'{}-{}-{}-dataengine-master-sg'.format(
+ data_engine['master_security_group_name'] =
'{}-{}-{}-de-master-sg'.format(
data_engine['service_base_name'], data_engine['project_name'],
data_engine['endpoint_name'])
- data_engine['slave_security_group_name'] =
'{}-{}-{}-dataengine-slave-sg'.format(
+ data_engine['slave_security_group_name'] =
'{}-{}-{}-de-slave-sg'.format(
data_engine['service_base_name'], data_engine['project_name'],
data_engine['endpoint_name'])
data_engine['cluster_name'] =
'{}-{}-{}-de-{}'.format(data_engine['service_base_name'],
data_engine['project_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
b/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
index d4bda85..9866d20 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
@@ -64,9 +64,9 @@ if __name__ == "__main__":
edge_conf['notebook_security_group_name'] =
edge_conf['service_base_name'] + "-" + edge_conf['user_name'] + "-" +
os.environ['endpoint_name']\
+ '-nb-sg'
edge_conf['master_security_group_name'] =
edge_conf['service_base_name'] + '-' \
- + edge_conf['user_name'] +
'-dataengine-master-sg'
+ + edge_conf['user_name'] +
'-de-master-sg'
edge_conf['slave_security_group_name'] =
edge_conf['service_base_name'] + '-' \
- + edge_conf['user_name'] +
'-dataengine-slave-sg'
+ + edge_conf['user_name'] +
'-de-slave-sg'
edge_conf['edge_storage_account_name'] =
('{0}-{1}-{2}-storage'.format(edge_conf['service_base_name'],
edge_conf['user_name'],
edge_conf['endpoint_name']))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]