You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by ad...@apache.org on 2019/10/04 14:29:34 UTC
[incubator-dlab] branch DLAB-1174-fix2 created (now 225acf7)
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a change to branch DLAB-1174-fix2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 225acf7 Hotfix for DataEngine_service creation.
This branch includes the following new commits:
new d74272a Hotfix for DataEngine creation (was failed on configure step).
new 27675dc Hotfix for DataEngine_service creation.
new 225acf7 Hotfix for DataEngine_service creation.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: Hotfix for DataEngine_service creation.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1174-fix2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 27675dc72c7bac74370ceeb7a3e68fff3f67bb99
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Fri Oct 4 17:25:56 2019 +0300
Hotfix for DataEngine_service creation.
---
.../src/general/scripts/aws/dataengine-service_prepare.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
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 03e34d2..8925630 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
@@ -89,7 +89,8 @@ if __name__ == "__main__":
emr_conf['project_tag'] = os.environ['project_name']
emr_conf['region'] = os.environ['aws_region']
emr_conf['release_label'] = os.environ['emr_version']
- emr_conf['edge_instance_name'] = '{0}-{1}-edge'.format(emr_conf['service_base_name'], os.environ['project_name'])
+ emr_conf['edge_instance_name'] = '{0}-{1}-{2}-edge'.format(emr_conf['service_base_name'],
+ os.environ['project_name'], emr_conf['endpoint_tag'])
emr_conf['edge_security_group_name'] = '{0}-sg'.format(emr_conf['edge_instance_name'])
emr_conf['master_instance_type'] = os.environ['emr_master_instance_type']
emr_conf['slave_instance_type'] = os.environ['emr_slave_instance_type']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: Hotfix for DataEngine_service creation.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1174-fix2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 225acf7e686fc81eab6d7a8cff8007ba91b84228
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Fri Oct 4 17:29:09 2019 +0300
Hotfix for DataEngine_service creation.
---
.../src/general/scripts/azure/project_prepare.py | 1 -
.../scripts/gcp/common_notebook_configure_dataengine-service.py | 3 ++-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index d25ac79..3fe0ecc 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -60,7 +60,6 @@ if __name__ == "__main__":
project_conf['region'] = os.environ['azure_region']
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'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
index 244c6e8..e085d04 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/common_notebook_configure_dataengine-service.py
@@ -53,7 +53,8 @@ if __name__ == "__main__":
notebook_config['cluster_name'] = meta_lib.GCPMeta().get_not_configured_dataproc(notebook_config['notebook_name'])
notebook_config['notebook_ip'] = meta_lib.GCPMeta().get_private_ip_address(notebook_config['notebook_name'])
notebook_config['key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
- edge_instance_name = '{0}-{1}-edge'.format(notebook_config['service_base_name'], notebook_config['project_name'])
+ edge_instance_name = '{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
+ notebook_config['project_name'], notebook_config['endpoint_tag'])
edge_instance_hostname = meta_lib.GCPMeta().get_private_ip_address(edge_instance_name)
if os.environ['application'] == 'deeplearning':
application = 'jupyter'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: Hotfix for DataEngine creation (was failed
on configure step).
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch DLAB-1174-fix2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d74272a660ea15cecbf5ffcb253cadad10719707
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Fri Oct 4 16:15:22 2019 +0300
Hotfix for DataEngine creation (was failed on configure step).
---
.../src/general/scripts/aws/dataengine-service_configure.py | 5 ++++-
.../src/general/scripts/gcp/dataengine-service_configure.py | 6 ++++--
2 files changed, 8 insertions(+), 3 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 f93910f..7b2011c 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -216,7 +216,10 @@ if __name__ == "__main__":
emr_conf['cluster_instances'] = get_emr_instances_list(emr_conf['cluster_id'])
emr_conf['cluster_master_instances'] = get_emr_instances_list(emr_conf['cluster_id'], 'MASTER')
emr_conf['cluster_core_instances'] = get_emr_instances_list(emr_conf['cluster_id'], 'CORE')
- emr_conf['edge_instance_name'] = emr_conf['service_base_name'] + "-" + os.environ['project_name'] + '-edge'
+ emr_conf['project_name'] = os.environ['project_name']
+ emr_conf['endpoint_name'] = os.environ['endpoint_name']
+ emr_conf['edge_instance_name'] = '{0}-{1}-{2}-edge'.format(emr_conf['service_base_name'],
+ emr_conf['project_name'], emr_conf['endpoint_name'])
emr_conf['edge_instance_hostname'] = get_instance_private_ip_address(emr_conf['tag_name'],
emr_conf['edge_instance_name'])
if emr_conf['network_type'] == 'private':
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
index bacace1..0944eb6 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
@@ -137,6 +137,7 @@ if __name__ == "__main__":
dataproc_conf['service_base_name'] = (os.environ['conf_service_base_name']).lower().replace('_', '-')
dataproc_conf['edge_user_name'] = (os.environ['edge_user_name']).lower().replace('_', '-')
dataproc_conf['project_name'] = (os.environ['project_name']).lower().replace('_', '-')
+ dataproc_conf['endpoint_name'] = (os.environ['endpoint_name']).lower().replace('_', '-')
dataproc_conf['key_name'] = os.environ['conf_key_name']
dataproc_conf['key_path'] = '{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
dataproc_conf['region'] = os.environ['gcp_region']
@@ -158,8 +159,9 @@ if __name__ == "__main__":
service_account_email = "{}@{}.iam.gserviceaccount.com".format(dataproc_conf['dataproc_service_account_name'],
os.environ['gcp_project_id'])
- dataproc_conf['edge_instance_name'] = '{0}-{1}-edge'.format(dataproc_conf['service_base_name'],
- dataproc_conf['project_name'])
+ dataproc_conf['edge_instance_name'] = '{0}-{1}-{2}-edge'.format(dataproc_conf['service_base_name'],
+ dataproc_conf['project_name'],
+ dataproc_conf['endpoint_name'])
dataproc_conf['edge_instance_hostname'] = GCPMeta().get_instance_public_ip_by_name(
dataproc_conf['edge_instance_name'])
dataproc_conf['dlab_ssh_user'] = os.environ['conf_os_user']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org