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/17 08:12:19 UTC
[incubator-dlab] branch fix_tarraform_gcp created (now 6693ee2)
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a change to branch fix_tarraform_gcp
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 6693ee2 Fixed dlab-terraform for gcp.
This branch includes the following new commits:
new 6693ee2 Fixed dlab-terraform for gcp.
The 1 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] 01/01: Fixed dlab-terraform for gcp.
Posted by ad...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a commit to branch fix_tarraform_gcp
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 6693ee277ebeecfc049c2e6747482f54405ac9de
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Tue Sep 17 11:12:07 2019 +0300
Fixed dlab-terraform for gcp.
---
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 4 ++--
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 2 +-
.../src/general/scripts/gcp/ssn_configure.py | 6 ++++--
3 files changed, 7 insertions(+), 5 deletions(-)
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 58af4e3..3c03100 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -176,7 +176,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
locale, region_info, ldap_login, tenant_id,
application_id, hostname, data_lake_name, subscription_id,
validate_permission_scope, dlab_id, usage_date, product,
- usage_type, usage, cost, resource_id, tags, billing_dataset_name='', report_path=''):
+ usage_type, usage, cost, resource_id, tags, billing_dataset_name, report_path=''):
try:
if not exists(os.environ['ssn_dlab_path'] + 'tmp/ss_started'):
java_path = sudo("update-alternatives --query java | grep 'Value: ' | grep -o '/.*/jre'")
@@ -283,7 +283,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
'--cost {} ' \
'--resource_id {} ' \
'--tags {} ' \
- '--billing_dataset_name "{}"'.\
+ '--billing_dataset_name "{}" '.\
format(cloud_provider,
service_base_name,
tag_resource_id,
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 24927e2..e5ed7b1 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -308,7 +308,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
'--cost {} ' \
'--resource_id {} ' \
'--tags {} ' \
- '--billing_dataset_name {}'.\
+ '--billing_dataset_name "{}" '.\
format(cloud_provider,
service_base_name,
tag_resource_id,
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index f25c045..25d8208 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -371,10 +371,12 @@ if __name__ == "__main__":
'value': ''
}
]
- params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} --os_family {} --billing_enabled --request_id {} --billing_dataset_name {} \
+ params = "--hostname {} --keyfile {} --dlab_path {} --os_user {} --os_family {} --billing_enabled {} " \
+ "--request_id {} --billing_dataset_name {} \
--resource {} --service_base_name {} --cloud_provider {} --cloud_params '{}'". \
format(instance_hostname, ssn_conf['ssh_key_path'], os.environ['ssn_dlab_path'], ssn_conf['dlab_ssh_user'],
- os.environ['conf_os_family'], billing_enabled, os.environ['request_id'], os.environ['billing_dataset_name'], os.environ['conf_resource'],
+ os.environ['conf_os_family'], billing_enabled, os.environ['request_id'],
+ os.environ['billing_dataset_name'], os.environ['conf_resource'],
ssn_conf['service_base_name'], os.environ['conf_cloud_provider'], json.dumps(cloud_params))
try:
local("~/scripts/{}.py {}".format('configure_ui', params))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org