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 a807365a24bdffb18dbd5cc51843088bfd8ac1e7 Author: leonidfrolov <[email protected]> AuthorDate: Fri Mar 6 17:36:27 2020 +0200 [DLAB-1593]: added usage of domain name during edge creation for gcp --- .../src/general/scripts/gcp/edge_configure.py | 6 +++++- .../src/project/scripts/configure_nginx_reverse_proxy.py | 2 ++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py index 39d00fe..c25fc4c 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py @@ -262,6 +262,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 {} " \ @@ -270,7 +274,7 @@ if __name__ == "__main__": os.environ['keycloak_user_password'], keycloak_client_secret, instance_hostname, os.environ['project_name'], os.environ['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/project/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py index a4f0825..786ea43 100644 --- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py +++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py @@ -63,6 +63,8 @@ if __name__ == "__main__": sys.exit(1) try: + if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ: + args.hostname = "{}.{}".format(os.environ['project_name'], os.environ['conf_domain_name']) install_nginx_lua(args.hostname, os.environ['reverse_proxy_nginx_version'], os.environ['keycloak_auth_server_url'], os.environ['keycloak_realm_name'], args.keycloak_client_id, args.keycloak_client_secret, args.user, args.hostname, --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
