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/09/16 09:38:17 UTC
[incubator-dlab] 01/01: Fixed name of GCP dataproc. Hotfix for ssn
creation on other clouds.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch fix_dataproc_2
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 334d74f7987c681a0abacc07c1eb4f5b6ae91c09
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Mon Sep 16 12:38:02 2019 +0300
Fixed name of GCP dataproc.
Hotfix for ssn creation on other clouds.
---
infrastructure-provisioning/src/general/lib/gcp/actions_lib.py | 4 ++--
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 ++
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 2 ++
3 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
index fddcad6..b4b2857 100644
--- a/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/gcp/actions_lib.py
@@ -867,12 +867,12 @@ class GCPActions:
slave_instances = cluster.get('config').get('workerConfig').get('instanceNames')
for instance in master_instances:
param = {}
- param['name'] = clusteName
+ param['name'] = instance
param['tag_name'] = clusteName + '-volume-primary'
dataproc_instances.append(param)
for instance in slave_instances:
param = {}
- param['name'] = clusteName
+ param['name'] = instance
param['tag_name'] = clusteName + '-volume-primary'
dataproc_instances.append(param)
GCPActions().set_disks_tag(dataproc_instances, zone, labels)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index ee09c8a..2addfa7 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -247,6 +247,8 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
append_result("Unable to upload webapp jars")
sys.exit(1)
if billing_enabled:
+ if cloud_provider != "gcp" or "GCP":
+ billing_dataset_name = ""
local('scp -i {} /root/scripts/configure_billing.py {}:/tmp/configure_billing.py'.format(keyfile,
host_string))
params = '--cloud_provider {} ' \
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
index 3269a68..8737b53 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -276,6 +276,8 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
sys.exit(1)
if billing_enabled:
+ if cloud_provider != "gcp" or "GCP":
+ billing_dataset_name = ""
local('scp -i {} /root/scripts/configure_billing.py {}:/tmp/configure_billing.py'.format(keyfile,
host_string))
params = '--cloud_provider {} ' \
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org