This is an automated email from the ASF dual-hosted git repository.

mykolabodnar pushed a commit to branch DLAB-1565-aws
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1565-aws by this push:
     new b6386fd  [DLAB-1565]: [Aws] - billing on local endpoint updated
b6386fd is described below

commit b6386fd03ffd92e25c9f72099044b8abbf2aefa8
Author: bodnarmykola <[email protected]>
AuthorDate: Wed Apr 1 09:26:42 2020 +0300

    [DLAB-1565]: [Aws] - billing on local endpoint updated
---
 infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py | 6 +++---
 infrastructure-provisioning/src/ssn/scripts/configure_billing.py | 2 +-
 infrastructure-provisioning/src/ssn/scripts/configure_ui.py      | 2 +-
 3 files changed, 5 insertions(+), 5 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 b3d176d..f828957 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/ssn_lib.py
@@ -196,7 +196,7 @@ 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':
+            if cloud_provider == 'gcp' or 'azure':
                 conf_parameter_name = '--spring.config.location='
                 with open('/root/templates/supervisor_svc.conf', 'r') as f:
                     text = f.read()
@@ -204,8 +204,8 @@ def start_ss(keyfile, host_string, dlab_conf_dir, web_path,
                     .replace('CONF_PARAMETER_NAME', conf_parameter_name)
                 with open('/root/templates/supervisor_svc.conf', 'w') as f:
                     f.write(text)
-            elif cloud_provider == 'aws' or 'azure':
-                conf_parameter_name = '--conf '
+            elif cloud_provider == 'aws':
+                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)\
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_billing.py 
b/infrastructure-provisioning/src/ssn/scripts/configure_billing.py
index c87af74..e377fc4 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_billing.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_billing.py
@@ -182,7 +182,7 @@ if __name__ == "__main__":
     try:
         yml_billing(args.dlab_dir + 'conf/billing.yml')
         if args.cloud_provider == 'aws':
-            yml_billing_app(args.dlab_dir + 'conf/application.yml')
+            yml_billing_app(args.dlab_dir + 'conf/billing_app.yml')
         yml_self_service(args.dlab_dir + 'conf/self-service.yml')
     except:
         print('Error configure billing')
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py 
b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 9bb436f..2e3cd85 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -179,7 +179,7 @@ def build_ui():
         elif args.cloud_provider == 'aws':
             sudo('cp {0}/sources/services/billing-aws/billing.yml 
{0}/webapp/billing/conf/'.format(args.dlab_path))
             sudo('cp 
{0}/sources/services/billing-aws/src/main/resources/application.yml '
-                 '{0}/webapp/billing/conf/'.format(args.dlab_path))
+                 
'{0}/webapp/billing/conf/billing_app.yml'.format(args.dlab_path))
             sudo(
                 'cp {0}/sources/services/billing-aws/target/billing-aws*.jar 
{0}/webapp/billing/lib/'.format(
                     args.dlab_path))


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to