You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/07/17 07:41:19 UTC
[incubator-dlab] branch DLAB-1748 updated: [DLAB-1748]: fix for
redhat ssn deployment
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1748
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1748 by this push:
new 60ac231 [DLAB-1748]: fix for redhat ssn deployment
60ac231 is described below
commit 60ac2310d51a15cf9b2172f3979c60f7bd7efd47
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Jul 17 10:40:58 2020 +0300
[DLAB-1748]: fix for redhat ssn deployment
---
.../src/general/lib/os/redhat/ssn_lib.py | 13 ++++++++++---
1 file changed, 10 insertions(+), 3 deletions(-)
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 83fd2ca..ddda21f 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -202,7 +202,8 @@ 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, keycloak_client_id,
+ keycloak_client_secret, keycloak_auth_server_url, report_path=''):
try:
if not exists('{}tmp/ss_started'.format(os.environ['ssn_dlab_path'])):
java_path = sudo("alternatives --display java | grep 'slave jre: ' | awk '{print $3}'")
@@ -307,7 +308,10 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
'--cost {} ' \
'--resource_id {} ' \
'--tags {} ' \
- '--billing_dataset_name "{}" '.\
+ '--billing_dataset_name "{}" ' \
+ '--keycloak_client_id {} ' \
+ '--keycloak_client_secret {} ' \
+ '--keycloak_auth_server_url {} '. \
format(cloud_provider,
service_base_name,
tag_resource_id,
@@ -331,7 +335,10 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
cost,
resource_id,
tags,
- billing_dataset_name)
+ billing_dataset_name,
+ keycloak_client_id,
+ keycloak_client_secret,
+ keycloak_auth_server_url)
sudo('python /tmp/configure_billing.py {}'.format(params))
try:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org