This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch DLAB-1593
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git

commit 52d27aa3d0eb395231191787b37bad9eff5d8368
Author: leonidfrolov <[email protected]>
AuthorDate: Fri Mar 6 17:40:40 2020 +0200

    [DLAB-1593]: added usage of domain name during edge keycloak config for 
azure and aws
---
 .../src/general/scripts/aws/edge_configure.py                       | 6 +++++-
 .../src/general/scripts/azure/edge_configure.py                     | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index d96ef49..e9ee621 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -226,6 +226,10 @@ if __name__ == "__main__":
         except:
             traceback.print_exc()
             raise Exception
+        if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+            hostname_param = "--hostname 
{}.{}".format(os.environ['project_name'], os.environ['conf_domain_name'])
+        else:
+            hostname_param = ''
         keycloak_params = "--service_base_name {} --keycloak_auth_server_url 
{} --keycloak_realm_name {} " \
                           "--keycloak_user {} --keycloak_user_password {} 
--keycloak_client_secret {} " \
                           "--edge_public_ip {} --hostname {} --project_name {} 
--endpoint_name {} ".format(
@@ -235,7 +239,7 @@ if __name__ == "__main__":
                            edge_conf['instance_hostname'], 
edge_conf['instance_hostname'], edge_conf['project_name'],
                            edge_conf['endpoint_name'])
         try:
-            local("~/scripts/{}.py {}".format('configure_keycloak', 
keycloak_params))
+            local("~/scripts/{}.py {} {}".format('configure_keycloak', 
keycloak_params, hostname_param))
         except:
             traceback.print_exc()
             raise Exception
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index 0949946..ce9d3cc 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -241,6 +241,10 @@ if __name__ == "__main__":
         except:
             traceback.print_exc()
             raise Exception
+        if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in 
os.environ:
+            hostname_param = "--hostname 
{}.{}".format(os.environ['project_name'], os.environ['conf_domain_name'])
+        else:
+            hostname_param = ''
         keycloak_params = "--service_base_name {} --keycloak_auth_server_url 
{} --keycloak_realm_name {} " \
                           "--keycloak_user {} --keycloak_user_password {} 
--keycloak_client_secret {} " \
                           "--edge_public_ip {} --project_name {} 
--endpoint_name {} ".format(
@@ -250,7 +254,7 @@ if __name__ == "__main__":
                            edge_conf['keycloak_client_secret'], 
edge_conf['instance_hostname'], edge_conf['project_name'],
                            edge_conf['endpoint_name'])
         try:
-            local("~/scripts/{}.py {}".format('configure_keycloak', 
keycloak_params))
+            local("~/scripts/{}.py {} {}".format('configure_keycloak', 
keycloak_params, hostname_param))
         except:
             traceback.print_exc()
             raise Exception


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to