You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by om...@apache.org on 2019/09/24 09:58:31 UTC
[incubator-dlab] branch DLAB-terraform updated: added changes to
self service
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-terraform
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-terraform by this push:
new fc47960 added changes to self service
fc47960 is described below
commit fc47960c2f6a170d326db307b20decbccfb452a0
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Tue Sep 24 12:58:23 2019 +0300
added changes to self service
---
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 5 ++++-
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 5 ++++-
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py | 4 ++++
.../src/general/scripts/azure/ssn_configure.py | 4 ++++
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 4 ++++
services/self-service/self-service.yml | 2 +-
6 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
index 3c03100..f5c0f11 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -230,7 +230,10 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
sudo('cp {0}/webapp/{1}/conf/*.yml /tmp/yml_tmp/'.format(dlab_path, service))
# Replacing Keycloak and cloud parameters
for item in json.loads(cloud_params):
- sudo('sed -i "s|{0}|{1}|g" /tmp/yml_tmp/self-service.yml'.format(
+ if "KEYCLOAK_" in item['key']:
+ sudo('sed -i "s|{0}|{1}|g" /tmp/yml_tmp/self-service.yml'.format(
+ item['key'], item['value']))
+ sudo('sed -i "s|{0}|{1}|g" /tmp/yml_tmp/provisioning-service.yml'.format(
item['key'], item['value']))
if cloud_provider == 'azure':
diff --git a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
index e5ed7b1..0bd96f1 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -256,7 +256,10 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
sudo('cp {0}/webapp/{1}/conf/*.yml /tmp/yml_tmp/'.format(dlab_path, service))
# Replacing Keycloak and cloud parameters
for item in json.loads(cloud_params):
- sudo('sed -i "s|{0}|{1}|g" /tmp/yml_tmp/self-service.yml'.format(
+ if "KEYCLOAK_" in item['key']:
+ sudo('sed -i "s|{0}|{1}|g" /tmp/yml_tmp/self-service.yml'.format(
+ item['key'], item['value']))
+ sudo('sed -i "s|{0}|{1}|g" /tmp/yml_tmp/provisioning-service.yml'.format(
item['key'], item['value']))
if os.environ['conf_cloud_provider'] == 'azure':
sudo('sed -i "s|<LOGIN_USE_LDAP>|{0}|g" /tmp/yml_tmp/self-service.yml'.format(ldap_login))
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 1f1d66d..07fc829 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -339,6 +339,10 @@ if __name__ == "__main__":
# mongo_parameters.update(secondary_parameters)
cloud_params = [
{
+ 'key': 'KEYCLOAK_REDIRECT_URI',
+ 'value': "http://{0}/".format(get_instance_hostname(tag_name, instance_name))
+ },
+ {
'key': 'KEYCLOAK_REALM_NAME',
'value': os.environ['keycloak_realm_name']
},
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index ea24afa..c8abf81 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -196,6 +196,10 @@ if __name__ == "__main__":
cloud_params = [
{
+ 'key': 'KEYCLOAK_REDIRECT_URI',
+ 'value': "http://{0}/".format(ssn_conf['instnace_ip'])
+ },
+ {
'key': 'KEYCLOAK_REALM_NAME',
'value': os.environ['keycloak_realm_name']
},
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index a407c10..ce14268 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -259,6 +259,10 @@ if __name__ == "__main__":
cloud_params = [
{
+ 'key': 'KEYCLOAK_REDIRECT_URI',
+ 'value': "http://{0}/".format(instance_hostname)
+ },
+ {
'key': 'KEYCLOAK_REALM_NAME',
'value': os.environ['keycloak_realm_name']
},
diff --git a/services/self-service/self-service.yml b/services/self-service/self-service.yml
index 86a3834..2f6040f 100644
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@ -177,7 +177,7 @@ guacamole:
username: dlab-user
keycloakConfiguration:
- redirectUri: REDIRECT_URI
+ redirectUri: KEYCLOAK_REDIRECT_URI
realm: KEYCLOAK_REALM_NAME
bearer-only: true
auth-server-url: KEYCLOAK_AUTH_SERVER_URL
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org