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 76a40cc74b93041a7826542f7dd35aa68791decf Author: leonidfrolov <[email protected]> AuthorDate: Wed Mar 11 16:50:54 2020 +0200 [DLAB-1593]: changed usage of some variables, added some prints --- .../src/general/scripts/aws/edge_configure.py | 3 +-- .../src/general/scripts/azure/edge_configure.py | 3 +-- .../src/general/scripts/gcp/edge_configure.py | 7 ++++--- .../src/project/scripts/configure_keycloak.py | 2 +- .../src/project/scripts/configure_nginx_reverse_proxy.py | 3 +-- infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 1 - 6 files changed, 8 insertions(+), 11 deletions(-) diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py index 1bb1c79..d2ff84c 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py @@ -229,8 +229,7 @@ if __name__ == "__main__": 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']) - sudo('touch /home/' + edge_conf['dlab_ssh_user'] + '/.ensure_dir/domain_name_ensured') + hostname_param = "--hostname {}.{}".format(edge_conf['project_name'], os.environ['conf_domain_name']) else: hostname_param = '' keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \ diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py index ab5ae39..b4dc1b6 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py @@ -242,8 +242,7 @@ if __name__ == "__main__": 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']) - sudo('touch /home/' + edge_conf['dlab_ssh_user'] + '/.ensure_dir/domain_name_ensured') + hostname_param = "--hostname {}.{}".format(edge_conf['project_name'], os.environ['conf_domain_name']) else: hostname_param = '' keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \ diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py index 406451c..cc8c354 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py @@ -251,9 +251,10 @@ if __name__ == "__main__": except: traceback.print_exc() raise Exception + print('[CONFIGURING KEYCLOAK]') + logging.info('[CONFIGURING KEYCLOAK]') 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']) - sudo('touch /home/' + edge_conf['dlab_ssh_user'] + '/.ensure_dir/domain_name_ensured') + hostname_param = "--hostname {}.{}".format(edge_conf['project_name'], os.environ['conf_domain_name']) else: hostname_param = '' keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \ @@ -265,7 +266,7 @@ if __name__ == "__main__": edge_conf['keycloak_client_secret'], edge_conf['instance_hostname'], edge_conf['project_name'], edge_conf['endpoint_name']) try: - local("~/scripts/{}.py {} {}".format('configure_keycloak', keycloak_params, hostname_param)) + 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_keycloak.py b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py index a40bad2..77253c5 100644 --- a/infrastructure-provisioning/src/project/scripts/configure_keycloak.py +++ b/infrastructure-provisioning/src/project/scripts/configure_keycloak.py @@ -66,9 +66,9 @@ if __name__ == "__main__": 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(',') + print(keycloak_redirectUris) keycloak_client_data = { "clientId": keycloak_client_name, "id": keycloak_client_id, 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 845a1a4..5d52a8c 100644 --- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py +++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py @@ -64,8 +64,7 @@ if __name__ == "__main__": 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']) - sudo('touch /home/' + args.user + '/.ensure_dir/domain_name_ensured') + args.hostname = "{}.{}".format((os.environ['project_name']).lower().replace('_', '-'), 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, diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py index bcbe85b..fb22bbe 100644 --- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py +++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py @@ -233,7 +233,6 @@ if __name__ == "__main__": if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ: args.hostname = "ssn.{}".format(os.environ['conf_domain_name']) - sudo('touch /home/' + args.os_user + '/.ensure_dir/domain_name_ensured') print("Installing nginx as frontend.") ensure_nginx(args.dlab_path) --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
