You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/03/06 15:37:41 UTC
[incubator-dlab] branch DLAB-1593 updated (f292b6b -> a807365)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1593
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from f292b6b [DLAB-1593]: added domain name for ssn on gcp
new a122bfc [DLAB-1593]: changed ssn_configure for awz and azure
new a807365 [DLAB-1593]: added usage of domain name during edge creation for gcp
The 2 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.
Summary of changes:
.../src/general/scripts/aws/ssn_configure.py | 39 +++++++++++++++++++---
.../src/general/scripts/azure/ssn_configure.py | 38 ++++++++++++++++++---
.../src/general/scripts/gcp/edge_configure.py | 6 +++-
.../scripts/configure_nginx_reverse_proxy.py | 2 ++
4 files changed, 76 insertions(+), 9 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: [DLAB-1593]: changed ssn_configure for awz
and azure
Posted by lf...@apache.org.
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 a122bfc35c853ab0b52cccd32d6c5351e262ef07
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Mar 6 16:58:33 2020 +0200
[DLAB-1593]: changed ssn_configure for awz and azure
---
.../src/general/scripts/aws/ssn_configure.py | 39 +++++++++++++++++++---
.../src/general/scripts/azure/ssn_configure.py | 38 ++++++++++++++++++---
2 files changed, 69 insertions(+), 8 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 9259032..9094850 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -142,6 +142,8 @@ if __name__ == "__main__":
step_cert_sans += ' --san {0} --san {1}'.format(
get_instance_hostname(tag_name, instance_name),
get_instance_ip_address(tag_name, instance_name).get('Public'))
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
+ step_cert_sans += ' --san ssn.{0}'.format(os.environ['conf_domain_name'])
else:
step_cert_sans = ''
@@ -350,10 +352,6 @@ if __name__ == "__main__":
# mongo_parameters.update(secondary_parameters)
cloud_params = [
{
- 'key': 'KEYCLOAK_REDIRECT_URI',
- 'value': "https://{0}/".format(get_instance_hostname(tag_name, instance_name))
- },
- {
'key': 'KEYCLOAK_REALM_NAME',
'value': os.environ['keycloak_realm_name']
},
@@ -558,6 +556,39 @@ if __name__ == "__main__":
'key': 'STEP_CA_URL',
'value': ''
})
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
+ cloud_params.append(
+ {
+ 'key': 'KEYCLOAK_REDIRECT_URI',
+ 'value': "https://{0}/, https://ssn.{1}/".format(get_instance_hostname(tag_name, instance_name),
+ os.environ['conf_domain_name'])
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME_ENABLED',
+ 'value': os.environ['conf_domain_name_enabled']
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME',
+ 'value': 'os.environ['conf_domain_name']'
+ })
+ else:
+ cloud_params.append(
+ {
+ 'key': 'KEYCLOAK_REDIRECT_URI',
+ 'value': "https://{0}/".format(get_instance_hostname(tag_name, instance_name))
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME_ENABLED',
+ 'value': 'false'
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME',
+ 'value': ''
+ })
logging.info('[CONFIGURE SSN INSTANCE UI]')
print('[CONFIGURE SSN INSTANCE UI]')
params = "--hostname {} " \
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index e1be85c..215ce0f 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -77,6 +77,8 @@ if __name__ == "__main__":
step_cert_sans += ' --san {0}'.format(
AzureMeta().get_instance_public_ip_address(ssn_conf['resource_group_name'],
ssn_conf['instance_name']))
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
+ step_cert_sans += ' --san ssn.{0}'.format(os.environ['conf_domain_name'])
else:
step_cert_sans = ''
@@ -201,10 +203,6 @@ if __name__ == "__main__":
cloud_params = [
{
- 'key': 'KEYCLOAK_REDIRECT_URI',
- 'value': "https://{0}/".format(ssn_conf['instnace_ip'])
- },
- {
'key': 'KEYCLOAK_REALM_NAME',
'value': os.environ['keycloak_realm_name']
},
@@ -374,6 +372,38 @@ if __name__ == "__main__":
'key': 'STEP_CA_URL',
'value': ''
})
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
+ cloud_params.append(
+ {
+ 'key': 'KEYCLOAK_REDIRECT_URI',
+ 'value': "https://{0}/, https://ssn.{1}/".format(ssn_conf['instnace_ip'], os.environ['conf_domain_name'])
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME_ENABLED',
+ 'value': os.environ['conf_domain_name_enabled']
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME',
+ 'value': 'os.environ['conf_domain_name']'
+ })
+ else:
+ cloud_params.append(
+ {
+ 'key': 'KEYCLOAK_REDIRECT_URI',
+ 'value': "https://{0}/".format(ssn_conf['instnace_ip'])
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME_ENABLED',
+ 'value': 'false'
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME',
+ 'value': ''
+ })
if os.environ['azure_datalake_enable'] == 'false':
cloud_params.append(
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: [DLAB-1593]: added usage of domain name
during edge creation for gcp
Posted by lf...@apache.org.
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 <fr...@gmail.com>
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: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org