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 35debc4e3b0781a50ff642ce95e52f68c88ec133
Author: leonidfrolov <[email protected]>
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       | 48 ++++++++++++++++++----
 .../src/ssn/scripts/configure_ssn_node.py          |  3 ++
 2 files changed, 44 insertions(+), 7 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 4a10115..1d79efd 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -126,9 +126,15 @@ if __name__ == "__main__":
     try:
         ssn_conf['instance_hostname'] = 
GCPMeta.get_instance_public_ip_by_name(ssn_conf['instance_name'])
         if os.environ['conf_stepcerts_enabled'] == 'true':
-            ssn_conf['step_cert_sans'] = ' --san {0} --san 
{1}'.format(GCPMeta.get_instance_public_ip_by_name(
-                ssn_conf['instance_name']), 
dlab.meta_lib.get_instance_private_ip_address('ssn',
-                                                                               
           ssn_conf['instance_name']))
+            if os.environ['conf_domain_name_enabled'] and 'conf_domain_name' 
in os.environ:
+                ssn_conf['step_cert_sans'] = ' --san {0} --san {1} --san 
ssn.{2}'.format(
+                    
GCPMeta.get_instance_public_ip_by_name(ssn_conf['instance_name']),
+                    
dlab.meta_lib.get_instance_private_ip_address('ssn',ssn_conf['instance_name']),
+                    os.environ['conf_domain_name'])
+            else:
+                ssn_conf['step_cert_sans'] = ' --san {0} --san 
{1}'.format(GCPMeta.get_instance_public_ip_by_name(
+                    ssn_conf['instance_name']), 
dlab.meta_lib.get_instance_private_ip_address('ssn', ssn_conf[
+                                                                               
                   'instance_name']))
         else:
             ssn_conf['step_cert_sans'] = ''
         if os.environ['conf_os_family'] == 'debian':
@@ -234,10 +240,6 @@ if __name__ == "__main__":
 
         cloud_params = [
             {
-                'key': 'KEYCLOAK_REDIRECT_URI',
-                'value': "https://{0}/".format(ssn_conf['instance_hostname'])
-            },
-            {
                 'key': 'KEYCLOAK_REALM_NAME',
                 'value': os.environ['keycloak_realm_name']
             },
@@ -370,6 +372,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://ssn.{}/*".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_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: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to