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 5ceaba8 fixed typo;
5ceaba8 is described below
commit 5ceaba860b577e499e3192bbe340420fc553c822
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Thu Sep 5 18:52:43 2019 +0300
fixed typo;
---
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 8 ++++----
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 8 ++++----
2 files changed, 8 insertions(+), 8 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 d260f9d..9eb659f 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -217,10 +217,10 @@ def start_ss(keyfile, host_string, dlab_conf_dir,
web_path,
jar = sudo('cd {0}{1}/lib/; find {1}*.jar -type
f'.format(web_path, service))
sudo('ln -s {0}{2}/lib/{1} {0}{2}/{2}.jar
'.format(web_path, jar, service))
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(
- item['key'], item['value']))
+ # 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(
+ item['key'], item['value']))
if 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/lib/os/redhat/ssn_lib.py
b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
index 6ef38c7..e80c434 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -243,10 +243,10 @@ def start_ss(keyfile, host_string, dlab_conf_dir,
web_path,
jar = sudo('cd {0}{1}/lib/; find {1}*.jar -type
f'.format(web_path, service))
sudo('ln -s {0}{2}/lib/{1} {0}{2}/{2}.jar
'.format(web_path, jar, service))
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(
- item['key'], item['value']))
+ # 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(
+ 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))
sudo('sed -i "s|<LOGIN_TENANT_ID>|{0}|g"
/tmp/yml_tmp/self-service.yml'.format(tenant_id))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]