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 <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
