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 2020/01/24 10:04:31 UTC
[incubator-dlab] branch DLAB-1462 created (now 9761434)
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a change to branch DLAB-1462
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 9761434 [DLAB-1462]: Fixed issue with SSN_INSTANCE_SIZE parameter
This branch includes the following new commits:
new 9761434 [DLAB-1462]: Fixed issue with SSN_INSTANCE_SIZE parameter
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: [DLAB-1462]: Fixed issue with
SSN_INSTANCE_SIZE parameter
Posted by om...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1462
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 9761434d7ad060308940e0b72c19b02111436b96
Author: Oleh Martushevskyi <Ol...@epam.com>
AuthorDate: Fri Jan 24 12:04:18 2020 +0200
[DLAB-1462]: Fixed issue with SSN_INSTANCE_SIZE parameter
---
infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 3 ++-
infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py | 2 ++
2 files changed, 4 insertions(+), 1 deletion(-)
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 feb4086..079b091 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -228,7 +228,8 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
item['key'], item['value']))
sudo('sed -i "s|SERVICE_BASE_NAME|{0}|g" /tmp/yml_tmp/self-service.yml'.format(service_base_name))
sudo('sed -i "s|OPERATION_SYSTEM|debian|g" /tmp/yml_tmp/self-service.yml')
-
+ sudo('sed -i "s|<SSN_INSTANCE_SIZE>|{0}|g" /tmp/yml_tmp/self-service.yml'.format(
+ os.environ['{0}_ssn_instance_size'.format(os.environ['conf_cloud_provider'])]))
if 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))
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 261bd23..d91c303 100644
--- a/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/redhat/ssn_lib.py
@@ -254,6 +254,8 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
item['key'], item['value']))
sudo('sed -i "s|SERVICE_BASE_NAME|{0}|g" /tmp/yml_tmp/self-service.yml'.format(service_base_name))
sudo('sed -i "s|OPERATION_SYSTEM|redhat|g" /tmp/yml_tmp/self-service.yml')
+ sudo('sed -i "s|<SSN_INSTANCE_SIZE>|{0}|g" /tmp/yml_tmp/self-service.yml'.format(
+ os.environ['{0}_ssn_instance_size'.format(os.environ['conf_cloud_provider'])]))
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: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org