[incubator-dlab] branch develop updated (1693024 -> e68872d)
This is an automated email from the ASF dual-hosted git repository. bhliva pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. from 1693024 Merge pull request #100 from apache/DLAB-590 add 6ef4981 DLAB-603 added public ip to getAllEnv API new e68872d Merge pull request #101 from apache/feature-DLAB-603 The 1 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. Summary of changes: .../com/epam/dlab/backendapi/resources/dto/UserResourceInfo.java | 8 .../epam/dlab/backendapi/service/impl/EnvironmentServiceImpl.java | 3 ++- 2 files changed, 10 insertions(+), 1 deletion(-) - To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-590 created (now 264f901)
This is an automated email from the ASF dual-hosted git repository. ioleksandr pushed a change to branch DLAB-590 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git. at 264f901 [DLAB-590] add information to status.json about error This branch includes the following new commits: new 264f901 [DLAB-590] add information to status.json about error The 1 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-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-599 updated: [DLAB-599] Add possibility to choose zone during DLab deployment
This is an automated email from the ASF dual-hosted git repository.
ioleksandr pushed a commit to branch DLAB-599
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-599 by this push:
new 7f9695e [DLAB-599] Add possibility to choose zone during DLab
deployment
7f9695e is described below
commit 7f9695e526bfba9a70f76be9dada7e0fa9342463
Author: Oleksandr_Isniuk
AuthorDate: Mon Apr 15 14:40:55 2019 +0300
[DLAB-599] Add possibility to choose zone during DLab deployment
---
infrastructure-provisioning/src/general/lib/aws/actions_lib.py | 2 --
1 file changed, 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
index cef7424..1664010 100644
--- a/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/aws/actions_lib.py
@@ -247,10 +247,8 @@ def create_subnet(vpc_id, subnet, tag, zone):
try:
ec2 = boto3.resource('ec2')
if zone != "":
-print('with zone@@@')
subnet = ec2.create_subnet(VpcId=vpc_id, CidrBlock=subnet,
AvailabilityZone=zone)
else:
-print('without zone@@@')
subnet = ec2.create_subnet(VpcId=vpc_id, CidrBlock=subnet)
create_tag(subnet.id, tag)
subnet.reload()
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
[incubator-dlab] branch DLAB-599 updated: add possibility to choose zone on edge provisioning
This is an automated email from the ASF dual-hosted git repository.
ioleksandr pushed a commit to branch DLAB-599
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-599 by this push:
new a25502c add possibility to choose zone on edge provisioning
a25502c is described below
commit a25502c43a2ae38b3b4422981a35abca8373e29a
Author: Oleksandr_Isniuk
AuthorDate: Mon Apr 15 13:10:21 2019 +0300
add possibility to choose zone on edge provisioning
---
infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py
index 71423cd..3c62665 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_prepare.py
@@ -88,6 +88,7 @@ if __name__ == "__main__":
edge_conf['allowed_ip_cidr'].append({"CidrIp": cidr.replace(' ','')})
edge_conf['network_type'] = os.environ['conf_network_type']
edge_conf['all_ip_cidr'] = '0.0.0.0/0'
+edge_conf['zone'] = os.environ['aws_region'] + os.environ['aws_zone']
if 'aws_user_predefined_s3_policies' not in os.environ:
os.environ['aws_user_predefined_s3_policies'] = 'None'
@@ -111,7 +112,7 @@ if __name__ == "__main__":
logging.info('[CREATE SUBNET]')
print('[CREATE SUBNET]')
params = "--vpc_id '{}' --infra_tag_name {} --infra_tag_value {}
--username {} --prefix {} " \
- "--user_subnets_range '{}'".format(edge_conf['vpc2_id'],
edge_conf['tag_name'],
+ "--user_subnets_range '{}'
--zone".format(edge_conf['vpc2_id'], edge_conf['tag_name'],
edge_conf['service_base_name'], os.environ['edge_user_name'],
edge_conf['private_subnet_prefix'],
os.environ['conf_user_subnets_range'])
-
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
