You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by ad...@apache.org on 2019/09/12 13:11:17 UTC
[incubator-dlab] branch DLAB-1037 created (now 2f8baf5)
This is an automated email from the ASF dual-hosted git repository.
adamsd pushed a change to branch DLAB-1037
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
at 2f8baf5 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets
This branch includes the following new commits:
new 6f4462a Merge remote-tracking branch 'origin/develop' into develop
new 323cdf0 Merge remote-tracking branch 'origin/develop' into develop
new 2f8baf5 [DLAB-1037]: Notebook creation fails in case of allocating the same CIDR to different subnets
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 03/03: [DLAB-1037]: Notebook creation fails in
case of allocating the same CIDR to different subnets
Posted by ad...@apache.org.
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 <ad...@gmail.com>
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-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/03: Merge remote-tracking branch
'origin/develop' into develop
Posted by ad...@apache.org.
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 323cdf08d301067eb929f382993d2035025288e7
Merge: 6f4462a 852175f
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Thu Sep 12 15:22:46 2019 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../main/java/com/epam/dlab/model/exploratory/Image.java | 1 +
.../com/epam/dlab/backendapi/dao/ImageExploratoryDao.java | 2 +-
.../epam/dlab/backendapi/dao/ImageExploratoryDaoImpl.java | 15 ++++++++-------
.../backendapi/resources/ImageExploratoryResource.java | 8 +++++---
.../dlab/backendapi/resources/dto/ImageInfoRecord.java | 1 +
.../dlab/backendapi/service/ImageExploratoryService.java | 2 +-
.../service/impl/ImageExploratoryServiceImpl.java | 8 +++++---
.../resources/ImageExploratoryResourceTest.java | 12 +++++++-----
.../service/impl/ImageExploratoryServiceImplTest.java | 8 ++++----
9 files changed, 33 insertions(+), 24 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/03: Merge remote-tracking branch
'origin/develop' into develop
Posted by ad...@apache.org.
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 6f4462a2852a060621778edb786a00d542a2eea7
Merge: e3f7dd7 7e07166
Author: AdamsDisturber <ad...@gmail.com>
AuthorDate: Tue Sep 10 16:42:38 2019 +0300
Merge remote-tracking branch 'origin/develop' into develop
.../src/general/lib/os/debian/common_lib.py | 54 +++++++++++-----------
.../scripts/aws/tensor-rstudio_configure.py | 2 +-
.../epam/dlab/backendapi/dao/SchedulerJobDAO.java | 2 +-
.../management/endpoints/endpoints.component.scss | 17 +++++++
.../manage-environment-dilog.component.html | 4 +-
.../administration/project/project.component.ts | 3 +-
.../src/app/core/services/userResource.service.ts | 4 +-
.../webapp/src/app/core/util/checkUtils.ts | 2 +-
.../create-environment.component.html | 2 +-
.../create-environment.component.scss | 6 +++
.../create-environment.component.ts | 2 +-
.../resources-grid/resources-grid.component.scss | 13 ++----
.../resources-grid/resources-grid.component.ts | 4 +-
.../confirmation-dialog.component.ts | 13 +++---
.../resources/webapp/src/assets/styles/_theme.scss | 17 ++-----
.../webapp/src/dictionary/aws.dictionary.ts | 4 +-
.../webapp/src/dictionary/azure.dictionary.ts | 4 +-
.../webapp/src/dictionary/gcp.dictionary.ts | 4 +-
18 files changed, 86 insertions(+), 71 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org