This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-1565
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1565 by this push:
new b7e6253 [DLAB-1565]: Convey billing for remote endpoints - [GCP]
billing added to supervisor
b7e6253 is described below
commit b7e6253ba2fe4b1ecc8a95a6c39f0e42ec74aa92
Author: Mykola_Bodnar1 <[email protected]>
AuthorDate: Tue Mar 10 11:45:55 2020 +0200
[DLAB-1565]: Convey billing for remote endpoints - [GCP] billing added to
supervisor
---
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 9 ++++++++-
.../terraform/bin/deploy/supervisor_svc.conf | 2 +-
2 files changed, 9 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 7bb15b2..e1945d9 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -538,8 +538,15 @@ def ensure_jar_endpoint():
'2.2.jar --no-check-certificate'
.format(web_path, args.repository_user,
args.repository_pass, args.repository_address))
- conn.run('mv {0}/*.jar {0}/provisioning-service.jar'
+ conn.run('mv {0}/provisioning-service-2.2.jar
{0}/provisioning-service.jar'
.format(web_path))
+ conn.run('wget -P {} --user={} --password={} '
+ 'https://{}/repository/packages/billing-{}-'
+ '2.2.jar --no-check-certificate'
+ .format(web_path, args.repository_user,
+ args.repository_pass, args.repository_address,
args.cloud_provider))
+ conn.run('mv {0}/billing-{1}-2.2.jar {0}/billing.jar'
+ .format(web_path, args.cloud_provider))
conn.sudo('touch {}'.format(ensure_file))
except Exception as err:
logging.error('Failed to download jar-provisioner: ', str(err))
diff --git
a/infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf
b/infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf
index 737fc6a..9c06695 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf
+++ b/infrastructure-provisioning/terraform/bin/deploy/supervisor_svc.conf
@@ -35,7 +35,7 @@ redirect_stderr=true
environment=DLAB_CONF_DIR="WEB_CONF"
[program:billing]
-command=java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8
billing/billing.jar CONF_PARAMETER_NAMEWEB_CONFbilling.yml
+command=java -Xmx1024M -jar -Duser.timezone=UTC -Dfile.encoding=UTF-8
WEB_APP_DIR/billing.jar CONF_PARAMETER_NAMEWEB_CONFbilling.yml
directory=WEB_APP_DIR
autorestart=true
priority=20
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]