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 f292b6b5d221d9b4bdb00e2bf6b102b1b341644d
Author: leonidfrolov <frolovl...@gmail.com>
AuthorDate: Fri Mar 6 16:42:44 2020 +0200
[DLAB-1593]: added domain name for ssn on gcp
---
.../src/general/scripts/gcp/ssn_configure.py | 43 +++++++++++++++++++---
.../src/ssn/scripts/configure_ssn_node.py | 3 ++
2 files changed, 41 insertions(+), 5 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 1fcbd03..7cdc60b 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -121,7 +121,12 @@ if __name__ == "__main__":
try:
instance_hostname =
GCPMeta().get_instance_public_ip_by_name(ssn_conf['instance_name'])
if os.environ['conf_stepcerts_enabled'] == 'true':
- step_cert_sans = ' --san {0} --san
{1}'.format(GCPMeta().get_instance_public_ip_by_name(
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name'
in os.environ:
+ step_cert_sans = ' --san {0} --san {1} --san
ssn.{2}'.format(GCPMeta().get_instance_public_ip_by_name(
+ ssn_conf['instance_name']),
get_instance_private_ip_address('ssn', ssn_conf['instance_name']),
+ os.environ['conf_domain_name'])
+ else:
+ step_cert_sans = ' --san {0} --san
{1}'.format(GCPMeta().get_instance_public_ip_by_name(
ssn_conf['instance_name']),
get_instance_private_ip_address('ssn', ssn_conf['instance_name']))
else:
step_cert_sans = ''
@@ -266,10 +271,6 @@ if __name__ == "__main__":
cloud_params = [
{
- 'key': 'KEYCLOAK_REDIRECT_URI',
- 'value': "https://{0}/".format(instance_hostname)
- },
- {
'key': 'KEYCLOAK_REALM_NAME',
'value': os.environ['keycloak_realm_name']
},
@@ -402,6 +403,38 @@ if __name__ == "__main__":
'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(instance_hostname,
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(instance_hostname)
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME_ENABLED',
+ 'value': 'false'
+ })
+ cloud_params.append(
+ {
+ 'key': 'DOMAIN_NAME',
+ 'value': ''
+ })
if os.environ['conf_stepcerts_enabled'] == 'true':
cloud_params.append(
{
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 42a6a09..fb22bbe 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -231,6 +231,9 @@ if __name__ == "__main__":
set_hostname(os.environ['ssn_subdomain'],
os.environ['ssn_hosted_zone_name'])
args.hostname = "{0}.{1}".format(os.environ['ssn_subdomain'],
os.environ['ssn_hosted_zone_name'])
+ if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' in
os.environ:
+ args.hostname = "ssn.{}".format(os.environ['conf_domain_name'])
+
print("Installing nginx as frontend.")
ensure_nginx(args.dlab_path)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
