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

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

commit f404b28bf9459e71703545ca5fed376605081d16
Author: Mykola_Bodnar1 <[email protected]>
AuthorDate: Mon Jan 27 15:44:41 2020 +0200

    [DLAB-1482] - [AWS]: Notebook/cluster links are not opened successfully 
fixed
---
 infrastructure-provisioning/src/general/scripts/aws/edge_configure.py | 4 ++--
 infrastructure-provisioning/src/project/scripts/configure_keycloak.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index dbecd52..eb72395 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -222,11 +222,11 @@ if __name__ == "__main__":
             raise Exception
         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 {} " \
+                          "--edge_public_ip {} --hostname {} --project_name {} 
" \
             .format(edge_conf['service_base_name'], 
os.environ['keycloak_auth_server_url'],
                     os.environ['keycloak_realm_name'], 
os.environ['keycloak_user'],
                     os.environ['keycloak_user_password'],
-                    keycloak_client_secret, edge_conf['edge_public_ip'], 
os.environ['project_name'])
+                    keycloak_client_secret, edge_conf['edge_public_ip'], 
instance_hostname, os.environ['project_name'])
         try:
             local("~/scripts/{}.py {}".format('configure_keycloak', 
keycloak_params))
         except:
diff --git 
a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py 
b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
index 1f8d706..d4b2aa0 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
@@ -39,6 +39,7 @@ parser.add_argument('--keycloak_user', type=str, default='')
 parser.add_argument('--keycloak_user_password', type=str, default='')
 parser.add_argument('--keycloak_client_secret', type=str, default='')
 parser.add_argument('--edge_public_ip', type=str, default='')
+parser.add_argument('--hostname', type=str, default='')
 parser.add_argument('--project_name', type=str, default='')
 args = parser.parse_args()
 
@@ -66,7 +67,7 @@ if __name__ == "__main__":
             "clientId": keycloak_client_name,
             "id": keycloak_client_id,
             "enabled": "true",
-            "redirectUris": ["https://{}/*".format(args.edge_public_ip)],
+            "redirectUris": ["https://{}/*".format(args.edge_public_ip), 
"http://{}/*".format(args.edge_public_ip), 
"https://{}/*".format(args.hostname), "http://{}/*".format(args.hostname)],
             "publicClient": "false",
             "secret": args.keycloak_client_secret,
             "protocol": "openid-connect",


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

Reply via email to