[incubator-dlab] branch DLAB-1835 updated: [DLAB-1835] - Jupyter Notebook creation in private subnet fixed

[my...@apache.org]

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

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


The following commit(s) were added to refs/heads/DLAB-1835 by this push:
     new 0cc9af0  [DLAB-1835] - Jupyter Notebook creation in private subnet fixed
0cc9af0 is described below

commit 0cc9af030a91bcb6f29348c25426a98d8dd8cd13
Author: bodnarmykola <bo...@gmail.com>
AuthorDate: Wed Jun 10 01:26:30 2020 +0300

    [DLAB-1835] - Jupyter Notebook creation in private subnet fixed
---
 .../src/general/scripts/aws/edge_configure.py                      | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 3a30bbd..68a473b 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -87,7 +87,10 @@ if __name__ == "__main__":
         tag = {"Key": edge_conf['tag_name'],
                "Value": "{}-{}-{}-subnet".format(edge_conf['service_base_name'], edge_conf['project_name'],
                                                  edge_conf['endpoint_name'])}
-        edge_conf['private_subnet_cidr'] = dlab.meta_lib.get_subnet_by_tag(tag)
+        if os.environ['aws_private_subnet_cidr']:
+            edge_conf['private_subnet_cidr'] = os.environ['aws_private_subnet_cidr']
+        else:
+            edge_conf['private_subnet_cidr'] = dlab.meta_lib.get_subnet_by_tag(tag)
         edge_conf['dlab_ssh_user'] = os.environ['conf_os_user']
         edge_conf['network_type'] = os.environ['conf_network_type']
         if edge_conf['network_type'] == 'public':
@@ -235,7 +238,7 @@ if __name__ == "__main__":
                            edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'],
                            os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
                            os.environ['keycloak_user_password'], edge_conf['keycloak_client_secret'],
-                           edge_conf['instance_hostname'], edge_conf['instance_private_ip'], edge_conf['project_name'],
+                           edge_conf['edge_public_ip'], edge_conf['instance_hostname'], edge_conf['project_name'],
                            edge_conf['endpoint_name'])
         try:
             local("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params))


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