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 f3a312c  [DLAB-1565]: Convey billing for remote endpoints - [GCP] 
billing.yml and variables fixed
f3a312c is described below

commit f3a312c62c805c573d55a9c4b634a5229f9d75f7
Author: Mykola_Bodnar1 <[email protected]>
AuthorDate: Tue Mar 10 16:39:08 2020 +0200

    [DLAB-1565]: Convey billing for remote endpoints - [GCP] billing.yml and 
variables fixed
---
 infrastructure-provisioning/terraform/bin/deploy/billing_gcp.yml    | 2 +-
 infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py    | 6 +++++-
 infrastructure-provisioning/terraform/bin/dlab.py                   | 1 +
 .../terraform/gcp/endpoint/main/variables.tf                        | 2 ++
 4 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/infrastructure-provisioning/terraform/bin/deploy/billing_gcp.yml 
b/infrastructure-provisioning/terraform/bin/deploy/billing_gcp.yml
index bc75bc3..7bf3f5b 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/billing_gcp.yml
+++ b/infrastructure-provisioning/terraform/bin/deploy/billing_gcp.yml
@@ -5,7 +5,7 @@ spring:
     mongodb:
       username: admin
       password: MONGO_PASSWORD
-      database: MONGO_PORT
+      database: dlabdb
       port: 27017
       host: MONGO_HOST
 dlab:
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py 
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index e1945d9..5718906 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -672,6 +672,10 @@ def configure_billing_endpoint(endpoint_keystore_password):
             elif args.cloud_provider == 'gcp':
                 billing_properties = [
                     {
+                        'key': "SERVICE_BASE_NAME",
+                        'value': args.service_base_name
+                    },
+                    {
                         'key': "OS_USER",
                         'value': args.os_user
                     },
@@ -688,7 +692,7 @@ def configure_billing_endpoint(endpoint_keystore_password):
                         'value': args.mongo_host
                     },
                     {
-                        'key': "KEYSTORE_PASSWORD",
+                        'key': "KEY_STORE_PASSWORD",
                         'value': endpoint_keystore_password
                     },
                     {
diff --git a/infrastructure-provisioning/terraform/bin/dlab.py 
b/infrastructure-provisioning/terraform/bin/dlab.py
index a5adaaa..6a70788 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -1170,6 +1170,7 @@ class GCPEndpointBuilder(AbstractDeployBuilder):
          .add_bool('--billing_enable', 'Billing enable', group='endpoint', 
default=False)
          .add_str('--billing_dataset_name', 'Billing dataset name', 
group='endpoint')
          .add_str('--mongo_password', 'Mongo database password', 
group='endpoint')
+         .add_str('--mongo_host', 'Mongo database host', group='endpoint')
          )
         return params.build()
 
diff --git 
a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf 
b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
index 3544116..b1d89ba 100644
--- a/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
+++ b/infrastructure-provisioning/terraform/gcp/endpoint/main/variables.tf
@@ -159,3 +159,5 @@ variable "billing_enable" {}
 variable "billing_dataset_name" {}
 
 variable "mongo_password" {}
+
+variable "mongo_host" {}


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

Reply via email to