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 12:55:25 UTC
[incubator-dlab] 01/01: Hotfix for DataEngine creation.
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 b2809f7e9c881ca3f9409d274c11ff6f0c1c6090
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Fri Oct 4 15:54:25 2019 +0300
Hotfix for DataEngine creation.
---
.../src/general/scripts/aws/dataengine-service_prepare.py | 8 ++++++--
.../src/general/scripts/aws/dataengine_configure.py | 5 ++++-
.../src/general/scripts/gcp/dataengine-service_prepare.py | 4 +++-
3 files changed, 13 insertions(+), 4 deletions(-)
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 b6bb8bd..03e34d2 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_prepare.py
@@ -55,8 +55,12 @@ if __name__ == "__main__":
emr_conf = dict()
emr_conf['service_base_name'] = os.environ['conf_service_base_name'] = replace_multi_symbols(
os.environ['conf_service_base_name'].lower()[:12], '-', True)
- edge_status = get_instance_status(emr_conf['service_base_name'] + '-Tag',
- 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']
+ edge_status = get_instance_status(emr_conf['service_base_name'] + '-Tag', '{0}-{1}-{2}-edge'
+ .format(emr_conf['service_base_name'],
+ emr_conf['project_name'],
+ emr_conf['endpoint_name']))
if edge_status != 'running':
logging.info('ERROR: Edge node is unavailable! Aborting...')
print('ERROR: Edge node is unavailable! Aborting...')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
index 20568d9..20f58af 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py
@@ -210,7 +210,10 @@ if __name__ == "__main__":
data_engine['dlab_ssh_user'] = os.environ['conf_os_user']
data_engine['user_keyname'] = os.environ['project_name']
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
- edge_instance_name = data_engine['service_base_name'] + "-" + os.environ['project_name'] + '-edge'
+ data_engine['project_name'] = os.environ['project_name']
+ data_engine['endpoint_name'] = os.environ['endpoint_name']
+ edge_instance_name = '{0}-{1}-{2}-edge'.format(data_engine['service_base_name'],
+ data_engine['project_name'], data_engine['endpoint_name'])
edge_instance_hostname = get_instance_hostname(data_engine['tag_name'], edge_instance_name)
edge_instance_private_ip = get_instance_ip_address(data_engine['tag_name'], edge_instance_name).get('Private')
if data_engine['network_type'] == 'private':
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
index adf6519..5a5404f 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
@@ -88,7 +88,9 @@ if __name__ == "__main__":
dataproc_conf['project_name'])
service_account_email = "{}@{}.iam.gserviceaccount.com".format(dataproc_conf['dataproc_service_account_name'],
os.environ['gcp_project_id'])
- dataproc_conf['edge_instance_hostname'] = '{0}-{1}-edge'.format(dataproc_conf['service_base_name'], dataproc_conf['project_name'])
+ dataproc_conf['edge_instance_hostname'] = '{0}-{1}-{2}-edge'.format(dataproc_conf['service_base_name'],
+ dataproc_conf['project_name'],
+ dataproc_conf['project_tag'])
dataproc_conf['dlab_ssh_user'] = os.environ['conf_os_user']
edge_status = GCPMeta().get_instance_status(dataproc_conf['edge_instance_hostname'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org