This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1174
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e2ac2da12717df5235d0868c0a1fe1a6066a65da
Author: AdamsDisturber <adamsdistur...@gmail.com>
AuthorDate: Wed Oct 2 16:49:24 2019 +0300
Changed edge name for billing (added endpoint name).
---
.../src/general/scripts/aws/project_prepare.py | 4 ++--
.../src/general/scripts/aws/project_terminate.py | 3 ++-
.../src/general/scripts/azure/project_prepare.py | 4 ++++
.../src/general/scripts/gcp/project_prepare.py | 3 ++-
4 files changed, 10 insertions(+), 4 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index 280b63a..f1ae5d2 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -55,8 +55,8 @@ if __name__ == "__main__":
project_conf['ami_id'] =
get_ami_id(os.environ['aws_{}_image_name'.format(os.environ['conf_os_family'])])
project_conf['instance_size'] = os.environ['aws_edge_instance_size']
project_conf['sg_ids'] = os.environ['aws_security_groups_ids']
- project_conf['edge_instance_name'] =
'{}-{}-edge'.format(project_conf['service_base_name'],
-
os.environ['project_name'])
+ project_conf['edge_instance_name'] =
'{}-{}-{}-edge'.format(project_conf['service_base_name'],
+
os.environ['project_name'], os.environ['endpoint_name'])
project_conf['tag_name'] =
'{}-Tag'.format(project_conf['service_base_name'])
project_conf['bucket_name_tag'] =
'{}-{}-bucket'.format(project_conf['service_base_name'],
os.environ['project_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
index 219d2f4..4711b4f 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
@@ -102,7 +102,8 @@ if __name__ == "__main__":
project_conf['tag_value'] = project_conf['service_base_name'] + "-" +
os.environ['project_name'] + '-*'
project_conf['edge_sg'] = project_conf['service_base_name'] + "-" +
os.environ['project_name'] + '-edge'
project_conf['nb_sg'] = project_conf['service_base_name'] + "-" +
os.environ['project_name'] + '-nb'
- project_conf['edge_instance_name'] = project_conf['service_base_name'] +
"-" + os.environ['project_name'] + '-edge'
+ project_conf['edge_instance_name'] =
'{}-{}-{}-edge'.format(project_conf['service_base_name'],
+
os.environ['project_name'], os.environ['endpoint_name'])
project_conf['de_sg'] = project_conf['service_base_name'] + "-" +
project_conf['project_name'] + \
'-dataengine*'
project_conf['emr_sg'] = project_conf['service_base_name'] + "-" +
project_conf['project_name'] + '-des-*'
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index 81ddf67..d25ac79 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -61,6 +61,10 @@ if __name__ == "__main__":
project_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
project_conf['private_subnet_prefix'] =
os.environ['azure_private_subnet_prefix']
project_conf['instance_name'] = project_conf['service_base_name'] +
"-" + project_conf['project_name'] + '-edge'
+
+ project_conf['instance_name'] =
'{0}-{1}-{2}-edge'.format(project_conf['service_base_name'],
+
project_conf['project_name'],
+
project_conf['endpoint_tag'])
project_conf['primary_disk_name'] = project_conf['instance_name'] +
'-disk0'
project_conf['edge_security_group_name'] =
project_conf['instance_name'] + '-sg'
project_conf['notebook_security_group_name'] =
project_conf['service_base_name'] + "-" + project_conf['project_name']\
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index 1611821..8b2b9bb 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -70,7 +70,8 @@ if __name__ == "__main__":
project_conf['project_name'])
project_conf['ps_policy_path'] = '/root/files/ps_policy.json'
project_conf['ps_roles_path'] = '/root/files/ps_roles.json'
- project_conf['instance_name'] =
'{0}-{1}-edge'.format(project_conf['service_base_name'],
project_conf['project_name'])
+ project_conf['instance_name'] =
'{0}-{1}-{2}-edge'.format(project_conf['service_base_name'],
+
project_conf['project_name'], project_conf['endpoint_tag'])
project_conf['ssn_instance_name'] =
'{}-ssn'.format(project_conf['service_base_name'])
project_conf['bucket_name'] =
'{0}-{1}-bucket'.format(project_conf['service_base_name'],
project_conf['project_name'])
project_conf['shared_bucket_name'] =
'{}-shared-bucket'.format(project_conf['service_base_name'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
