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/12 10:00:51 UTC
[incubator-dlab] 03/15: [DLAB-1593]: changed ssn_configure for awz
and azure
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 3117a5a6ddd82521f7c4e87a3983bf6ac3d1d1b2
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 | 40 +++++++++++++++++++---
.../src/general/scripts/azure/ssn_configure.py | 38 +++++++++++++++++---
2 files changed, 69 insertions(+), 9 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 87587d8..ec86d5c 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -175,6 +175,8 @@ if __name__ == "__main__":
dlab.meta_lib.get_instance_hostname(ssn_conf['tag_name'], ssn_conf['instance_name']),
dlab.meta_lib.get_instance_ip_address(ssn_conf['tag_name'],
ssn_conf['instance_name']).get('Public'))
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
+ ssn_conf['step_cert_sans'] += ' --san ssn.{0}'.format(os.environ['conf_domain_name'])
else:
ssn_conf['step_cert_sans'] = ''
@@ -273,11 +275,6 @@ if __name__ == "__main__":
try:
cloud_params = [
{
- 'key': 'KEYCLOAK_REDIRECT_URI',
- 'value': "https://{0}/".format(dlab.meta_lib.get_instance_hostname(ssn_conf['tag_name'],
- ssn_conf['instance_name']))
- },
- {
'key': 'KEYCLOAK_REALM_NAME',
'value': os.environ['keycloak_realm_name']
},
@@ -482,6 +479,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://ssn.{0}/".format(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(dlab.meta_lib.get_instance_hostname(ssn_conf['tag_name'],
+ ssn_conf['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 856cce4..a105d05 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -102,6 +102,8 @@ if __name__ == "__main__":
AzureMeta.get_instance_public_ip_address(ssn_conf['resource_group_name'],
ssn_conf['instance_name']),
ssn_conf['instance_dns_name'])
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in os.environ:
+ ssn_conf['step_cert_sans'] += ' --san ssn.{0}'.format(os.environ['conf_domain_name'])
else:
ssn_conf['step_cert_sans'] = ''
@@ -212,10 +214,6 @@ if __name__ == "__main__":
cloud_params = [
{
- 'key': 'KEYCLOAK_REDIRECT_URI',
- 'value': "https://{0}/".format(ssn_conf['instance_host'])
- },
- {
'key': 'KEYCLOAK_REALM_NAME',
'value': os.environ['keycloak_realm_name']
},
@@ -385,6 +383,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://ssn.{0}/".format(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['instance_host'])
+ })
+ 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