You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by my...@apache.org on 2020/04/02 14:31:24 UTC
[incubator-dlab] branch DLAB-1685 updated: [DLAB-1685]: Local
billing fixed
This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1685
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1685 by this push:
new 774e243 [DLAB-1685]: Local billing fixed
774e243 is described below
commit 774e243da0c1a8dcfb6981857522efa573e957f2
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Thu Apr 2 17:30:34 2020 +0300
[DLAB-1685]: Local billing fixed
---
.../src/general/lib/os/debian/ssn_lib.py | 12 ++++++------
1 file changed, 6 insertions(+), 6 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 67aa572..74d3c36 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -196,18 +196,18 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
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')
sudo('mv /tmp/proxy_location_webapp_template.conf ' + os.environ['ssn_dlab_path'] + 'tmp/')
- if cloud_provider == 'gcp' or 'azure':
- print('Unknown reason but we are here')
- conf_parameter_name = '--spring.config.location='
+ if cloud_provider == 'aws':
+ print('Good known reason we are here')
+ conf_parameter_name = '--spring.config.location={0}billing_app.yml --conf '.format(dlab_conf_dir)
with open('/root/templates/supervisor_svc.conf', 'r') as f:
text = f.read()
text = text.replace('WEB_CONF', dlab_conf_dir).replace('OS_USR', os_user)\
.replace('CONF_PARAMETER_NAME', conf_parameter_name)
with open('/root/templates/supervisor_svc.conf', 'w') as f:
f.write(text)
- elif cloud_provider == 'aws':
- print('Good known reason we are here')
- conf_parameter_name = '--spring.config.location={0}billing_app.yml --conf '.format(dlab_conf_dir)
+ elif cloud_provider == 'gcp' or cloud_provider == 'azure':
+ print('Unknown reason but we are here')
+ conf_parameter_name = '--spring.config.location='
with open('/root/templates/supervisor_svc.conf', 'r') as f:
text = f.read()
text = text.replace('WEB_CONF', dlab_conf_dir).replace('OS_USR', os_user)\
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org