You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by my...@apache.org on 2020/01/28 12:58:08 UTC
[incubator-dlab] branch DLAB-1483-1 created (now e0ae67b)
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a change to branch DLAB-1483-1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at e0ae67b [DLAB-1482] - [AWS]: Notebook/cluster links are not opened successfully fixed
This branch includes the following new commits:
new e0ae67b [DLAB-1482] - [AWS]: Notebook/cluster links are not opened successfully fixed
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: [DLAB-1482] - [AWS]: Notebook/cluster links
are not opened successfully fixed
Posted by my...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1483-1
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit e0ae67bbec038ec18282de9b588dc5eb4cf04907
Author: Mykola_Bodnar1 <bo...@gmail.com>
AuthorDate: Tue Jan 28 14:57:05 2020 +0200
[DLAB-1482] - [AWS]: Notebook/cluster links are not opened successfully fixed
---
.../src/general/scripts/azure/edge_configure.py | 2 +-
.../src/project/scripts/configure_keycloak.py | 7 ++++++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index 0dc0904..efc3b5e 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -90,7 +90,7 @@ if __name__ == "__main__":
edge_conf['instance_name'])
edge_conf['edge_private_ip'] = AzureMeta().get_private_ip_address(edge_conf['resource_group_name'],
edge_conf['instance_name'])
- instance_hostname = AzureMeta().get_private_ip_address(edge_conf['resource_group_name'],
+ instance_hostname = AzureMeta().get_instance_public_ip_address(edge_conf['resource_group_name'],
edge_conf['instance_name'])
edge_conf['vpc_cidrs'] = AzureMeta().get_vpc(edge_conf['resource_group_name'],
edge_conf['vpc_name']).address_space.address_prefixes
diff --git a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
index c6914f9..3f6614e 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
@@ -60,11 +60,16 @@ if __name__ == "__main__":
keycloak_client_create_url = '{0}/admin/realms/{1}/clients'.format(args.keycloak_auth_server_url, args.keycloak_realm_name)
keycloak_client_name = "{0}-{1}".format(args.service_base_name, args.project_name)
keycloak_client_id = str(uuid.uuid4())
+ if args.hostname == '':
+ keycloak_redirectUris = 'https://{0}/*, http://{0}/*'.format(args.edge_public_ip).split(',')
+ print(keycloak_redirectUris)
+ else:
+ keycloak_redirectUris = 'https://{0}/*, http://{0}/*, https://{1}/*, http://{1}/*'.format(args.edge_public_ip, args.hostname).split(',')
keycloak_client_data = {
"clientId": keycloak_client_name,
"id": keycloak_client_id,
"enabled": "true",
- "redirectUris": ["http://{}/*".format(args.edge_public_ip)],
+ "redirectUris": keycloak_redirectUris,
"publicClient": "false",
"secret": args.keycloak_client_secret,
"protocol": "openid-connect",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org