You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by dm...@apache.org on 2019/07/19 08:41:42 UTC
[incubator-dlab] branch DLAB-915 updated: [DLAB-915] bugfix[2]
This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-915
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-915 by this push:
new 55da639 [DLAB-915] bugfix[2]
55da639 is described below
commit 55da6393c63602b9f14de6e068a6159b9e183cef
Author: Dyoma33 <de...@gmail.com>
AuthorDate: Fri Jul 19 11:41:30 2019 +0300
[DLAB-915] bugfix[2]
---
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 2 +-
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 4 +++-
2 files changed, 4 insertions(+), 2 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 dcc7c30..73b0a85 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -262,8 +262,8 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
'--tags {}'.\
format(cloud_provider,
service_base_name,
- billing_tag,
tag_resource_id,
+ billing_tag,
account_id,
billing_bucket,
aws_job_enabled,
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 164dfc5..22bb59d 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -195,7 +195,7 @@ def ensure_mongo():
def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
os_user, mongo_passwd, keystore_passwd, cloud_provider,
- service_base_name, tag_resource_id, account_id, billing_bucket,
+ service_base_name, tag_resource_id, billing_tag, account_id, billing_bucket,
aws_job_enabled, dlab_path, billing_enabled,
authentication_file, offer_number, currency,
locale, region_info, ldap_login, tenant_id,
@@ -270,6 +270,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
params = '--cloud_provider {} ' \
'--infrastructure_tag {} ' \
'--tag_resource_id {} ' \
+ '--billing_tag {} ' \
'--account_id {} ' \
'--billing_bucket {} ' \
'--aws_job_enabled {} ' \
@@ -292,6 +293,7 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
format(cloud_provider,
service_base_name,
tag_resource_id,
+ billing_tag,
account_id,
billing_bucket,
aws_job_enabled,
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org