dlab-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From omartushevs...@apache.org
Subject [incubator-dlab] branch DLAB-1158 updated: added step-ca
Date Mon, 09 Dec 2019 13:33:53 GMT
This is an automated email from the ASF dual-hosted git repository.

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


The following commit(s) were added to refs/heads/DLAB-1158 by this push:
     new 06210ff  added step-ca
06210ff is described below

commit 06210ff275498f200050750c0ab2ca47399cb2e5
Author: Oleh Martushevskyi <Oleh_Martushevskyi@epam.com>
AuthorDate: Mon Dec 9 15:33:43 2019 +0200

    added step-ca
---
 .../src/general/scripts/aws/edge_configure.py         | 15 ++++++++++-----
 .../src/general/scripts/azure/edge_configure.py       | 12 ++++++++----
 .../src/general/scripts/gcp/edge_configure.py         | 19 +++++++++++++------
 3 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 1f1345e..ca25e2c 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -211,17 +211,22 @@ if __name__ == "__main__":
         print('[INSTALLING NGINX REVERSE PROXY]')
         logging.info('[INSTALLING NGINX REVERSE PROXY]')
         keycloak_client_secret = str(uuid.uuid4())
-        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 {} --step_cert_sans '{}' " \
-            .format(edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'],
os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
+        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 {} " \
+            .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'],
-                    keycloak_client_secret, edge_conf['edge_public_ip'], os.environ['project_name'],
step_cert_sans)
+                    keycloak_client_secret, edge_conf['edge_public_ip'], os.environ['project_name'])
         try:
             local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
         except:
             traceback.print_exc()
             raise Exception
-        params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} --keycloak_client_secret
{}" \
-            .format(instance_hostname, keyfile_name, edge_conf['dlab_ssh_user'], edge_conf['service_base_name']
+ '-' + os.environ['project_name'], keycloak_client_secret)
+        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)
         try:
             local("~/scripts/{}.py {}".format('configure_nginx_reverse_proxy', params))
         except:
diff --git a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index c0f156d..2229481 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -281,20 +281,24 @@ if __name__ == "__main__":
         logging.info('[INSTALLING NGINX REVERSE PROXY]')
 
         keycloak_client_secret = str(uuid.uuid4())
-        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 {} --step_cert_sans '{}'" \
+        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 {}" \
             .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'],
-                    keycloak_client_secret, instance_hostname, os.environ['project_name'],
step_cert_sans)
+                    keycloak_client_secret, instance_hostname, os.environ['project_name'])
         try:
             local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
         except:
             traceback.print_exc()
             raise Exception
 
-        params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} --keycloak_client_secret
{}" \
+        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'], keycloak_client_secret,
+                    step_cert_sans)
 
         try:
             local("~/scripts/{}.py {}".format('configure_nginx_reverse_proxy', params))
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 50d9f26..22c0e0e 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -185,7 +185,8 @@ if __name__ == "__main__":
                              "vpc_cidrs": edge_conf['vpc_cidrs'],
                              "allowed_ip_cidr": edge_conf['allowed_ip_cidr']}
         params = "--hostname {} --keyfile {} --additional_config '{}' --user {}" \
-                 .format(instance_hostname, edge_conf['ssh_key_path'], json.dumps(additional_config),
edge_conf['dlab_ssh_user'])
+                 .format(instance_hostname, edge_conf['ssh_key_path'], json.dumps(additional_config),
+                         edge_conf['dlab_ssh_user'])
         try:
             local("~/scripts/{}.py {}".format('configure_http_proxy', params))
         except:
@@ -249,18 +250,24 @@ if __name__ == "__main__":
         logging.info('[INSTALLING NGINX REVERSE PROXY]')
 
         keycloak_client_secret = str(uuid.uuid4())
-        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 {} --step_cert_sans '{}'" \
-            .format(edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'],
os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
+        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 {}" \
+            .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'],
-                    keycloak_client_secret, instance_hostname, os.environ['project_name'],
step_cert_sans)
+                    keycloak_client_secret, instance_hostname, os.environ['project_name'])
         try:
             local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))
         except:
             traceback.print_exc()
             raise Exception
 
-        params = "--hostname {} --keyfile {} --user {} --keycloak_client_id {} --keycloak_client_secret
{}" \
-            .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)
+        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,
+                    step_cert_sans)
 
         try:
             local("~/scripts/{}.py {}".format('configure_nginx_reverse_proxy', params))


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org


Mime
View raw message