This is an automated email from the ASF dual-hosted git repository.

mykolabodnar pushed a commit to branch DLAB-1499
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1499 by this push:
     new 0a3d7d9  [DLAB-1499]: Noteboks/links are not loaded successfully if 
project contains more than one edge fixed
0a3d7d9 is described below

commit 0a3d7d9f3a726a3ed80b939a5e1fc76a2c26308a
Author: Mykola_Bodnar1 <[email protected]>
AuthorDate: Mon Feb 3 17:25:26 2020 +0200

    [DLAB-1499]: Noteboks/links are not loaded successfully if project contains 
more than one edge fixed
---
 infrastructure-provisioning/src/general/scripts/aws/edge_configure.py | 2 +-
 .../src/general/scripts/aws/project_terminate.py                      | 2 +-
 .../src/general/scripts/azure/edge_configure.py                       | 2 +-
 .../src/general/scripts/azure/project_terminate.py                    | 2 +-
 infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py | 4 ++--
 .../src/general/scripts/gcp/project_terminate.py                      | 2 +-
 6 files changed, 7 insertions(+), 7 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 889708f..de9a2a2 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -214,7 +214,7 @@ if __name__ == "__main__":
         params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} 
--keycloak_client_secret {} " \
                  "--step_cert_sans '{}' " \
             .format(instance_hostname, keyfile_name, 
edge_conf['dlab_ssh_user'], edge_conf['service_base_name'] +
-                    '-' + os.environ['project_name'], keycloak_client_secret, 
step_cert_sans)
+                    '-' + os.environ['project_name'] + '-' + 
os.environ['endpoint_name'], keycloak_client_secret, step_cert_sans)
         try:
             local("~/scripts/{}.py {}".format('configure_nginx_reverse_proxy', 
params))
         except:
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py 
b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
index deee78d..c0ec4d5 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_terminate.py
@@ -148,7 +148,7 @@ if __name__ == "__main__":
         }
 
         client_params = {
-            "clientId": project_conf['service_base_name'] + '-' + 
project_conf['project_name'],
+            "clientId": project_conf['service_base_name'] + '-' + 
project_conf['project_name'] + '-' + os.environ['endpoint_name'],
         }
 
         keycloak_token = requests.post(keycloak_auth_server_url, 
data=keycloak_auth_data).json()
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index e6625bd..fd33ff4 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -283,7 +283,7 @@ if __name__ == "__main__":
         params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} 
--keycloak_client_secret {} " \
                  "--step_cert_sans '{}'" \
             .format(instance_hostname, keyfile_name, 
edge_conf['dlab_ssh_user'],
-                    edge_conf['service_base_name'] + '-' + 
os.environ['project_name'], keycloak_client_secret,
+                    edge_conf['service_base_name'] + '-' + 
os.environ['project_name'] + '-' + os.environ['endpoint_name'], 
keycloak_client_secret,
                     step_cert_sans)
 
         try:
diff --git 
a/infrastructure-provisioning/src/general/scripts/azure/project_terminate.py 
b/infrastructure-provisioning/src/general/scripts/azure/project_terminate.py
index 1f4b4a9..202a68b 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_terminate.py
@@ -173,7 +173,7 @@ if __name__ == "__main__":
         }
 
         client_params = {
-            "clientId": project_conf['service_base_name'] + '-' + 
os.environ['project_name'],
+            "clientId": project_conf['service_base_name'] + '-' + 
os.environ['project_name'] + '-' + os.environ['endpoint_name'],
         }
 
         keycloak_token = requests.post(keycloak_auth_server_url, 
data=keycloak_auth_data).json()
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index e3024f2..7bf8e00 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -252,7 +252,7 @@ if __name__ == "__main__":
         params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} 
--keycloak_client_secret {} " \
                  "--step_cert_sans '{}'" \
             .format(instance_hostname, edge_conf['ssh_key_path'], 
edge_conf['dlab_ssh_user'],
-                    edge_conf['service_base_name'] + '-' + 
os.environ['project_name'], keycloak_client_secret,
+                    edge_conf['service_base_name'] + '-' + 
os.environ['project_name'] + '-' + os.environ['endpoint_name'], 
keycloak_client_secret,
                     step_cert_sans)
 
         try:
@@ -262,7 +262,7 @@ if __name__ == "__main__":
             raise Exception
         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 {} \
+                          "--edge_public_ip {} --project_name {} 
--endpoint_name {} " \
             .format(edge_conf['service_base_name'], 
os.environ['keycloak_auth_server_url'],
                     os.environ['keycloak_realm_name'], 
os.environ['keycloak_user'],
                     os.environ['keycloak_user_password'],
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py 
b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
index e6d06fb..079ab1e 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_terminate.py
@@ -166,7 +166,7 @@ if __name__ == "__main__":
         }
 
         client_params = {
-            "clientId": project_conf['service_base_name'] + '-' + 
os.environ['project_name'],
+            "clientId": project_conf['service_base_name'] + '-' + 
os.environ['project_name'] + '-' + os.environ['endpoint_name'],
         }
 
         keycloak_token = requests.post(keycloak_auth_server_url, 
data=keycloak_auth_data).json()


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to