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 cf007550a7ac3473d3b2d1dd17b8702ff73781c3
Author: Mykola_Bodnar1 <bodnarmyk...@gmail.com>
AuthorDate: Mon Jan 27 16:30:50 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 fbf6cd0..4f84e92 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -203,10 +203,10 @@ if __name__ == "__main__":
print('[INSTALLING NGINX REVERSE PROXY]')
logging.info('[INSTALLING NGINX REVERSE PROXY]')
keycloak_client_secret = str(uuid.uuid4())
- 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 {}" \
+ 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
{}" \
.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 c6914f9..4153e0d 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()
@@ -64,7 +65,7 @@ if __name__ == "__main__":
"clientId": keycloak_client_name,
"id": keycloak_client_id,
"enabled": "true",
- "redirectUris": ["http://{}/*".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: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
