[incubator-dlab] branch DLAB-1565 updated: [DLAB-1565]: Convey billing for remote endpoints - variables for GCP added

[my...@apache.org]

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 aa5a8ca  [DLAB-1565]: Convey billing for remote endpoints - variables for GCP added
aa5a8ca is described below

commit aa5a8ca70e278fe62c6358d8bd1425c714bd5ff4
Author: Mykola_Bodnar1 <bo...@gmail.com>
AuthorDate: Thu Mar 5 09:02:13 2020 +0200

    [DLAB-1565]: Convey billing for remote endpoints - variables for GCP added
---
 infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 7 ++++++-
 infrastructure-provisioning/terraform/bin/dlab.py                | 3 +++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 6be5e1e..25dabdd 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -649,7 +649,9 @@ def configure_guacamole():
 
 def configure_billing_endpoint():
     try:
-        if billing_enable:
+        if args.billing_enable:
+            conn.put('./provisioning.yml', '{}/conf/provisioning.yml'
+                     .format(args.dlab_path))
             billing_yml_path = "{}/conf/billing.yml".format(args.dlab_path)
             with open(billing_yml_path, 'r') as config_yml_r:
                 config_orig = config_yml_r.read()
@@ -763,6 +765,9 @@ def init_args():
     parser.add_argument('--shared_image_enabled', type=str, default='true')
     parser.add_argument('--image_enabled', type=str, default='true')
     parser.add_argument('--auth_file_path', type=str, default='')
+
+    #Billing parameter
+    parser.add_argument('--billing_enable', type=bool, default=False)
     parser.add_argument('--aws_job_enabled', type=str, default='false')
     parser.add_argument('--billing_bucket', type=str, default='')
     parser.add_argument('--report_path', type=str, default='')
diff --git a/infrastructure-provisioning/terraform/bin/dlab.py b/infrastructure-provisioning/terraform/bin/dlab.py
index 07214c8..a5adaaa 100644
--- a/infrastructure-provisioning/terraform/bin/dlab.py
+++ b/infrastructure-provisioning/terraform/bin/dlab.py
@@ -1167,6 +1167,9 @@ class GCPEndpointBuilder(AbstractDeployBuilder):
          .add_str('--endpoint_policies', 'Endpoint policies list', group='endpoint')
          .add_str('--endpoint_roles', 'Endpoint roles list', group='endpoint')
          .add_str('--bucket_region', 'Bucket region', group='endpoint')
+         .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')
          )
         return params.build()
 


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org