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/05 13:56:22 UTC
[incubator-dlab] branch DLAB-terraform updated: fixed issue with
yml conf file and provisioning 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 b25f143 fixed issue with yml conf file and provisioning service;
b25f143 is described below
commit b25f143d567c6ac4117e9a05efe1a94bca5cff45
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Thu Sep 5 16:56:14 2019 +0300
fixed issue with yml conf file and provisioning service;
---
.../src/general/lib/os/debian/ssn_lib.py | 8 ++++++++
.../src/general/lib/os/redhat/ssn_lib.py | 8 ++++++++
.../src/general/scripts/aws/ssn_configure.py | 2 +-
.../src/general/scripts/azure/ssn_configure.py | 2 +-
.../src/general/scripts/gcp/ssn_configure.py | 2 +-
services/provisioning-service/provisioning.yml | 8 ++++----
services/self-service/self-service.yml | 18 +++++++++---------
7 files changed, 32 insertions(+), 16 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 72fc5a9..d260f9d 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -187,6 +187,14 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
local('sed -i "s|\${JRE_HOME}|' + java_path + '|g" /root/templates/ssn.yml')
sudo('sed -i "s|KEYNAME|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
format(os.environ['conf_key_name'], dlab_path))
+ sudo('sed -i "s|KEYCLOAK_REALM_NAME|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
+ format(os.environ['keycloak_realm_name'], dlab_path))
+ sudo('sed -i "s|KEYCLOAK_AUTH_SERVER_URL|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
+ format(os.environ['keycloak_auth_server_url'], dlab_path))
+ sudo('sed -i "s|KEYCLOAK_CLIENT_NAME|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
+ format(os.environ['keycloak_client_name'], dlab_path))
+ sudo('sed -i "s|KEYCLOAK_CLIENT_SECRET|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
+ format(os.environ['keycloak_client_secret'], dlab_path))
put('/root/templates/ssn.yml', '/tmp/ssn.yml')
sudo('mv /tmp/ssn.yml ' + os.environ['ssn_dlab_path'] + 'conf/')
put('/root/templates/proxy_location_webapp_template.conf', '/tmp/proxy_location_webapp_template.conf')
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 b3022d2..6ef38c7 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -213,6 +213,14 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
local('sed -i "s|\${JRE_HOME}|' + java_path + '|g" /root/templates/ssn.yml')
sudo('sed -i "s|KEYNAME|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
format(os.environ['conf_key_name'], dlab_path))
+ sudo('sed -i "s|KEYCLOAK_REALM_NAME|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
+ format(os.environ['keycloak_realm_name'], dlab_path))
+ sudo('sed -i "s|KEYCLOAK_AUTH_SERVER_URL|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
+ format(os.environ['keycloak_auth_server_url'], dlab_path))
+ sudo('sed -i "s|KEYCLOAK_CLIENT_NAME|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
+ format(os.environ['keycloak_client_name'], dlab_path))
+ sudo('sed -i "s|KEYCLOAK_CLIENT_SECRET|{}|g" {}/webapp/provisioning-service/conf/provisioning.yml'.
+ format(os.environ['keycloak_client_secret'], dlab_path))
put('/root/templates/ssn.yml', '/tmp/ssn.yml')
sudo('mv /tmp/ssn.yml ' + os.environ['ssn_dlab_path'] + 'conf/')
put('/root/templates/proxy_location_webapp_template.conf', '/tmp/proxy_location_webapp_template.conf')
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index b2d58db..ae88c15 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -411,7 +411,7 @@ if __name__ == "__main__":
'value': os.environ['ldap_ou']
},
{
- 'key': 'LDAP_USER',
+ 'key': 'LDAP_USER_NAME',
'value': os.environ['ldap_service_username']
},
{
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 1831241..570f87f 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -268,7 +268,7 @@ if __name__ == "__main__":
'value': os.environ['ldap_ou']
},
{
- 'key': 'LDAP_USER',
+ 'key': 'LDAP_USER_NAME',
'value': os.environ['ldap_service_username']
},
{
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index bd70272..93541e8 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -331,7 +331,7 @@ if __name__ == "__main__":
'value': os.environ['ldap_ou']
},
{
- 'key': 'LDAP_USER',
+ 'key': 'LDAP_USER_NAME',
'value': os.environ['ldap_service_username']
},
{
diff --git a/services/provisioning-service/provisioning.yml b/services/provisioning-service/provisioning.yml
index 094f6be..1fbf2cf 100644
--- a/services/provisioning-service/provisioning.yml
+++ b/services/provisioning-service/provisioning.yml
@@ -88,12 +88,12 @@ logging:
archivedFileCount: 10
keycloakConfiguration:
- realm: DLAB_bhliva
+ realm: KEYCLOAK_REALM_NAME
bearer-only: true
- auth-server-url: http://52.11.45.11:8080/auth
+ auth-server-url: KEYCLOAK_AUTH_SERVER_URL
ssl-required: none
register-node-at-startup: true
register-node-period: 600
- resource: sss
+ resource: KEYCLOAK_CLIENT_NAME
credentials:
- secret: 37338cc5-77f9-47f9-9d95-5cb716b91118
\ No newline at end of file
+ secret: KEYCLOAK_CLIENT_SECRET
\ No newline at end of file
diff --git a/services/self-service/self-service.yml b/services/self-service/self-service.yml
index aa0d0fa..bb15141 100644
--- a/services/self-service/self-service.yml
+++ b/services/self-service/self-service.yml
@@ -110,14 +110,14 @@ logging:
com.novemberain: ERROR
io.swagger.v3: DEBUG
appenders:
- <#if DEV_MODE == "true">
-- type: console
- </#if>
-- type: file
- currentLogFilename: ${LOG_ROOT_DIR}/ssn/selfservice.log
- archive: true
- archivedLogFilenamePattern: ${LOG_ROOT_DIR}/ssn/selfservice-%d{yyyy-MM-dd}.log.gz
- archivedFileCount: 10
+ <#if DEV_MODE == "true">
+ - type: console
+ </#if>
+ - type: file
+ currentLogFilename: ${LOG_ROOT_DIR}/ssn/selfservice.log
+ archive: true
+ archivedLogFilenamePattern: ${LOG_ROOT_DIR}/ssn/selfservice-%d{yyyy-MM-dd}.log.gz
+ archivedFileCount: 10
swaggerConfiguration:
resourcePackage: com.epam.dlab.backendapi.resources
@@ -218,7 +218,7 @@ cloudProperties:
host: LDAP_HOST
dn: LDAP_DN
ou: LDAP_OU
- user: LDAP_USER
+ user: LDAP_USER_NAME
password: LDAP_USER_PASSWORD
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org