[incubator-dlab] 03/03: [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets

2019-09-12 Thread adamsd
This is an automated email from the ASF dual-hosted git repository.

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

commit 2f8baf59aca3810b26d731ab2411cea2cf156879
Author: AdamsDisturber 
AuthorDate: Thu Sep 12 16:09:30 2019 +0300

[DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to 
different subnets
---
 .../src/general/scripts/aws/common_prepare_notebook.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
index 6d3de38..64d13e8 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -118,7 +118,8 @@ if __name__ == "__main__":
 params = "--node_name {} --ami_id {} --instance_type {} --key_name {} 
--security_group_ids {} --subnet_id {} --iam_profile {} --infra_tag_name {} 
--infra_tag_value {} --instance_class {} --instance_disk_size {} 
--primary_disk_size {}" \
 .format(notebook_config['instance_name'], 
notebook_config['ami_id'], notebook_config['instance_type'],
 notebook_config['key_name'], 
get_security_group_by_name(notebook_config['security_group_name']),
-get_subnet_by_cidr(notebook_config['subnet_cidr']), 
notebook_config['role_profile_name'],
+get_subnet_by_cidr(notebook_config['subnet_cidr'], 
os.environ['aws_notebook_vpc_id']),
+notebook_config['role_profile_name'],
 notebook_config['tag_name'], 
notebook_config['instance_name'], instance_class,
 os.environ['notebook_disk_size'], 
notebook_config['primary_disk_size'])
 try:


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



[incubator-dlab] 03/03: [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets

2019-09-12 Thread adamsd
This is an automated email from the ASF dual-hosted git repository.

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

commit fdb88bd066ae018a027cee0df8a9a12e6708c598
Author: AdamsDisturber 
AuthorDate: Thu Sep 12 16:04:58 2019 +0300

[DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to 
different subnets
---
 .../src/general/scripts/aws/common_prepare_notebook.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
index 6d3de38..64d13e8 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -118,7 +118,8 @@ if __name__ == "__main__":
 params = "--node_name {} --ami_id {} --instance_type {} --key_name {} 
--security_group_ids {} --subnet_id {} --iam_profile {} --infra_tag_name {} 
--infra_tag_value {} --instance_class {} --instance_disk_size {} 
--primary_disk_size {}" \
 .format(notebook_config['instance_name'], 
notebook_config['ami_id'], notebook_config['instance_type'],
 notebook_config['key_name'], 
get_security_group_by_name(notebook_config['security_group_name']),
-get_subnet_by_cidr(notebook_config['subnet_cidr']), 
notebook_config['role_profile_name'],
+get_subnet_by_cidr(notebook_config['subnet_cidr'], 
os.environ['aws_notebook_vpc_id']),
+notebook_config['role_profile_name'],
 notebook_config['tag_name'], 
notebook_config['instance_name'], instance_class,
 os.environ['notebook_disk_size'], 
notebook_config['primary_disk_size'])
 try:


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