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 da24299 added step-ca
da24299 is described below
commit da2429982db9ae1379e594e0eb0782ef23e794f8
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Mon Dec 9 16:33:53 2019 +0200
added step-ca
---
.../src/general/scripts/aws/edge_configure.py | 18 ++++++++--------
.../src/general/scripts/azure/edge_configure.py | 24 ++++++++++------------
.../src/general/scripts/gcp/edge_configure.py | 24 ++++++++++------------
3 files changed, 31 insertions(+), 35 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index ca25e2c..dbecd52 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -211,6 +211,15 @@ if __name__ == "__main__":
print('[INSTALLING NGINX REVERSE PROXY]')
logging.info('[INSTALLING NGINX REVERSE PROXY]')
keycloak_client_secret = str(uuid.uuid4())
+ 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:
+ traceback.print_exc()
+ 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 {} " \
@@ -223,15 +232,6 @@ if __name__ == "__main__":
except:
traceback.print_exc()
raise Exception
- 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:
- traceback.print_exc()
- raise Exception
except Exception as err:
print('Error: {0}'.format(err))
append_result("Failed installing nginx reverse proxy." + str(err))
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
index 2229481..f5d4fbf 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_configure.py
@@ -279,8 +279,18 @@ if __name__ == "__main__":
try:
print('[INSTALLING NGINX REVERSE PROXY]')
logging.info('[INSTALLING NGINX REVERSE PROXY]')
-
keycloak_client_secret = str(uuid.uuid4())
+ 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:
+ traceback.print_exc()
+ 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 {}" \
@@ -293,18 +303,6 @@ if __name__ == "__main__":
except:
traceback.print_exc()
raise Exception
-
- 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:
- traceback.print_exc()
- raise Exception
except Exception as err:
print('Error: {0}'.format(err))
append_result("Failed installing Nginx reverse proxy. Excpeption: " +
str(err))
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 22c0e0e..79d06fb 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -248,8 +248,18 @@ if __name__ == "__main__":
try:
print('[INSTALLING NGINX REVERSE PROXY]')
logging.info('[INSTALLING NGINX REVERSE PROXY]')
-
keycloak_client_secret = str(uuid.uuid4())
+ 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))
+ except:
+ traceback.print_exc()
+ 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 {}" \
@@ -262,18 +272,6 @@ if __name__ == "__main__":
except:
traceback.print_exc()
raise Exception
-
- 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))
- except:
- traceback.print_exc()
- raise Exception
except Exception as err:
print('Error: {0}'.format(err))
append_result("Failed installing nginx reverse proxy. Excpeption: " +
str(err))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
