[incubator-dlab] branch DLAB-1467 updated: [DLAB-1467]: Added terraform scripts for deploying DLab endpoint

[omartushevskyi]

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

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


The following commit(s) were added to refs/heads/DLAB-1467 by this push:
     new 3f06079  [DLAB-1467]: Added terraform scripts for deploying DLab 
endpoint
3f06079 is described below

commit 3f060791e9481b35ea15241a5d0a3e3240d09df5
Author: Oleh Martushevskyi <oleh_martushevs...@epam.com>
AuthorDate: Wed Feb 5 13:29:05 2020 +0200

    [DLAB-1467]: Added terraform scripts for deploying DLab endpoint
---
 infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py 
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index a7c9a34..47ead50 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -315,7 +315,8 @@ def 
configure_supervisor_endpoint(endpoint_keystore_password):
                       .format(args.dlab_path, supervisor_conf))
             conn.put('./provisioning.yml', '{}provisioning.yml'
                      .format(dlab_conf_dir))
-
+            if args.resource_group_name == '':
+                args.resource_group_name = args.service_base_name
             cloud_properties = [
                 {
                     'key': "OS_USER",
@@ -415,7 +416,7 @@ def 
configure_supervisor_endpoint(endpoint_keystore_password):
                 },
                 {
                     'key': "AZURE_RESOURCE_GROUP_NAME",
-                    'value': args.azure_resource_group_name
+                    'value': args.resource_group_name
                 },
                 {
                     'key': "AZURE_SSN_STORAGE_ACCOUNT_TAG",
@@ -743,7 +744,7 @@ def init_args():
     parser.add_argument('--conf_key_dir', type=str, default='/root/keys/', 
help='Should end by symbol /')
     parser.add_argument('--vpc_id', type=str, default='')
     parser.add_argument('--peering_id', type=str, default='')
-    parser.add_argument('--azure_resource_group_name', type=str, default='')
+    parser.add_argument('--resource_group_name', type=str, default='')
     parser.add_argument('--azure_ssn_storage_account_tag', type=str, 
default='')
     parser.add_argument('--azure_shared_storage_account_tag', type=str, 
default='')
     parser.add_argument('--azure_datalake_tag', type=str, default='')


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