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 eb4f7f7 [DLAB-1546]: added name convention changes
eb4f7f7 is described below
commit eb4f7f7fb4a38f76f6f6097f824e4657093ada10
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Feb 28 18:05:05 2020 +0200
[DLAB-1546]: added name convention changes
---
.../src/general/scripts/aws/dataengine-service_configure.py | 2 +-
.../src/general/scripts/aws/dataengine-service_prepare.py | 2 +-
.../src/general/scripts/aws/dataengine_configure.py | 2 +-
.../src/general/scripts/aws/dataengine_prepare.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py | 2 +-
infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py | 2 +-
.../src/general/scripts/aws/dataengine_terminate.py | 2 +-
.../src/general/scripts/azure/dataengine_configure.py | 2 +-
.../src/general/scripts/azure/dataengine_prepare.py | 2 +-
.../src/general/scripts/azure/dataengine_start.py | 2 +-
.../src/general/scripts/azure/dataengine_stop.py | 2 +-
.../src/general/scripts/azure/dataengine_terminate.py | 2 +-
.../src/general/scripts/gcp/dataengine_configure.py | 2 +-
.../src/general/scripts/gcp/dataengine_prepare.py | 2 +-
14 files changed, 14 insertions(+), 14 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
index c57a8b8..da9aec8 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -201,7 +201,7 @@ if __name__ == "__main__":
.format(emr_conf['service_base_name'],
emr_conf['project_name'],
emr_conf['endpoint_name'],
- emr_conf['exploratory_name'],
+ emr_conf['computational_name'],
args.uuid)
emr_conf['bucket_name'] =
('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'],
emr_conf['project_name'],
emr_conf['endpoint_name']))
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
index b629142..8bb1bce 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
@@ -111,7 +111,7 @@ if __name__ == "__main__":
.format(emr_conf['service_base_name'],
emr_conf['project_name'],
emr_conf['endpoint_name'],
- emr_conf['exploratory_name'],
+ emr_conf['computational_name'],
args.uuid)
emr_conf['bucket_name'] =
('{0}-{1}-{2}-bucket'.format(emr_conf['service_base_name'],
emr_conf['project_name'],
emr_conf['endpoint_name']))
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
index 1dbe82a..e45ae45 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
@@ -176,7 +176,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
data_engine['master_node_name'] = data_engine['cluster_name'] + '-m'
data_engine['slave_node_name'] = data_engine['cluster_name'] + '-s'
data_engine['master_size'] = os.environ['aws_dataengine_master_shape']
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
index 5e695ef..ad19f7a 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
@@ -76,7 +76,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
data_engine['master_node_name'] =
'{}-m'.format(data_engine['cluster_name'])
data_engine['slave_node_name'] =
'{}-s'.format(data_engine['cluster_name'])
data_engine['master_size'] = os.environ['aws_dataengine_master_shape']
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
index 68799c7..0450ff7 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
@@ -70,7 +70,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
logging.info('[START DATA ENGINE CLUSTER]')
print('[START DATA ENGINE CLUSTER]')
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py
index adeb176..d31d395 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_stop.py
@@ -65,7 +65,7 @@ if __name__ == "__main__":
data_engine_config['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine_config['service_base_name'],
data_engine_config['project_name'],
data_engine_config['endpoint_name'],
-
data_engine_config['exploratory_name'])
+
data_engine_config['computational_name'])
logging.info('[STOP DATA ENGINE CLUSTER]')
print('[STOP DATA ENGINE CLUSTER]')
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_terminate.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_terminate.py
index fb0f1c7..7d8c10d 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_terminate.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_terminate.py
@@ -76,7 +76,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
data_engine['notebook_name'] = os.environ['notebook_instance_name']
data_engine['key_path'] = "{}/{}.pem".format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
index 3337d10..f31024c 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
@@ -192,7 +192,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
'{}-{}-{}-de-{}'.format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
data_engine['master_node_name'] =
'{}-m'.format(data_engine['cluster_name'])
data_engine['slave_node_name'] =
'{}-s'.format(data_engine['cluster_name'])
data_engine['master_network_interface_name'] =
'{}-nif'.format(data_engine['master_node_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
index 856e3b3..86dc7a9 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
@@ -79,7 +79,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
'{}-{}-{}-de-{}'.format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
data_engine['master_node_name'] =
'{}-m'.format(data_engine['cluster_name'])
data_engine['slave_node_name'] =
'{}-s'.format(data_engine['cluster_name'])
data_engine['master_network_interface_name'] =
'{}-nif'.format(data_engine['master_node_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
index 7e348b6..308912f 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_start.py
@@ -74,7 +74,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
'{}-{}-{}-de-{}'.format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
try:
logging.info('[STARTING DATA ENGINE]')
print('[STARTING DATA ENGINE]')
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_stop.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_stop.py
index 75718f1..963c555 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_stop.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_stop.py
@@ -73,7 +73,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
'{}-{}-{}-de-{}'.format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
try:
logging.info('[STOPPING DATA ENGINE]')
print('[STOPPING DATA ENGINE]')
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_terminate.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_terminate.py
index e6eef7c..1363eb8 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_terminate.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_terminate.py
@@ -80,7 +80,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
'{}-{}-{}-de-{}'.format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
data_engine['notebook_name'] = os.environ['notebook_instance_name']
data_engine['key_path'] = '{}{}.pem'.format(os.environ['conf_key_dir'],
os.environ['conf_key_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
index 80a3374..43f31f8 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py
@@ -190,7 +190,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
data_engine['master_node_name'] = data_engine['cluster_name'] + '-m'
data_engine['slave_node_name'] = data_engine['cluster_name'] + '-s'
data_engine['instance_count'] =
int(os.environ['dataengine_instance_count'])
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
index ee388ce..df3ab49 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
@@ -101,7 +101,7 @@ if __name__ == "__main__":
data_engine['cluster_name'] =
"{}-{}-{}-de-{}".format(data_engine['service_base_name'],
data_engine['project_name'],
data_engine['endpoint_name'],
-
data_engine['exploratory_name'])
+
data_engine['computational_name'])
data_engine['master_node_name'] = data_engine['cluster_name'] + '-m'
data_engine['slave_node_name'] = data_engine['cluster_name'] + '-s'
data_engine['instance_count'] =
int(os.environ['dataengine_instance_count'])
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]