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 fb5deb6  [DLAB-1565]: [AWS] - billing on remote endpoint fixes
fb5deb6 is described below

commit fb5deb61886921d165f4d9aba86e5adddce6dc24
Author: bodnarmykola <[email protected]>
AuthorDate: Fri Mar 20 12:24:16 2020 +0200

    [DLAB-1565]: [AWS] - billing on remote endpoint fixes
---
 .../terraform/aws/endpoint/main/variables.tf                   | 10 ++++++++++
 .../terraform/bin/deploy/endpoint_fab.py                       |  2 +-
 infrastructure-provisioning/terraform/bin/dlab.py              |  6 ++++++
 services/billing-aws/src/main/resources/application.yml        |  2 +-
 4 files changed, 18 insertions(+), 2 deletions(-)

diff --git 
a/infrastructure-provisioning/terraform/aws/endpoint/main/variables.tf 
b/infrastructure-provisioning/terraform/aws/endpoint/main/variables.tf
index 1b825b5..343fcb4 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/variables.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/variables.tf
@@ -87,3 +87,13 @@ variable "billing_enable" {}
 variable "mongo_password" {}
 
 variable "mongo_host" {}
+
+variable "billing_bucket" {}
+
+variable "report_path" {}
+
+variable "aws_job_enabled" {}
+
+variable "billing_aws_account_id" {}
+
+variable "billing_tag" {}
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py 
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index dc9c5ee..4825991 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -341,7 +341,7 @@ def 
configure_supervisor_endpoint(endpoint_keystore_password):
                                            
'subnet-id'.format(interface)).stdout
                 args.vpc2_id = args.vpc_id
                 args.subnet2_id = args.subnet_id
-                conn.sudo('sed -i 
"s|CONF_PARAMETER|--spring.config.location={0}billing_app.yml --conf |g" 
{1}/tmp/supervisor_svc.conf'
+                conn.sudo('sed -i 
"s|CONF_PARAMETER|--spring.config.location={0}billing_app.yml --conf=|g" 
{1}/tmp/supervisor_svc.conf'
                           .format(dlab_conf_dir, args.dlab_path))
             if args.cloud_provider == 'gcp':
                 conn.sudo('sed -i 
"s|CONF_PARAMETER|--spring.config.location=|g" {}/tmp/supervisor_svc.conf'
diff --git a/infrastructure-provisioning/terraform/bin/dlab.py 
b/infrastructure-provisioning/terraform/bin/dlab.py
index eee15db..1ce6d07 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -988,6 +988,12 @@ class AWSEndpointBuilder(AbstractDeployBuilder):
          .add_bool('--billing_enable', 'Billing enable', group='endpoint', 
default=False)
          .add_str('--mongo_password', 'Mongo database password', 
group='endpoint')
          .add_str('--mongo_host', 'Mongo database host', group='endpoint', 
default='localhost')
+         .add_str('--billing_bucket', 'Billing bucket name', group='endpoint', 
default='')
+         .add_str('--report_path', 'The path to report folder', 
group='endpoint', default='')
+         .add_str('--aws_job_enabled', 'Billing format. Available options: 
true (aws), false(epam)', group='endpoint',
+                  default='false')
+         .add_str('--billing_aws_account_id', 'The ID of ASW linked account', 
group='endpoint', default='')
+         .add_str('--billing_tag', 'Billing tag', group='endpoint', 
default='dlab')
          )
         return params.build()
 
diff --git a/services/billing-aws/src/main/resources/application.yml 
b/services/billing-aws/src/main/resources/application.yml
index b31f91a..8af84e1 100644
--- a/services/billing-aws/src/main/resources/application.yml
+++ b/services/billing-aws/src/main/resources/application.yml
@@ -17,7 +17,7 @@ server:
 server.ssl.key-store-type: JKS
 server.ssl.key-store: /Users/ofuks/keys/dlabcert/billing.jks
 server.ssl.key-store-password: KEYSTORE_PASSWORD
-server.ssl.key-alias: billing
+server.ssl.key-alias: endpoint
 
 logging:
   file: /var/opt/dlab/log/ssn/billing.log


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

Reply via email to