This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1483
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 1234719eb91da505a2849a432b20c34e00defa1a
Author: Mykola_Bodnar1 <bodnarmyk...@gmail.com>
AuthorDate: Tue Jan 28 14:49:23 2020 +0200
[DLAB-1483] - [Azure]: [Azure] Notebooks/Data engine links are not loaded
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 7c49d25..e1837ca 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 d4b2aa0..56a2b92 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py
@@ -63,11 +63,16 @@ if __name__ == "__main__":
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": ["https://{}/*".format(args.edge_public_ip),
"http://{}/*".format(args.edge_public_ip),
"https://{}/*".format(args.hostname), "http://{}/*".format(args.hostname)],
+ "redirectUris": keycloak_redirectUris,
"publicClient": "false",
"secret": args.keycloak_client_secret,
"protocol": "openid-connect",
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
