You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@datalab.apache.org by lf...@apache.org on 2021/04/20 11:21:31 UTC
[incubator-datalab] branch DATALAB-2091 updated (b49443a -> ebc58fd)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from b49443a Merge pull request #1137 from apache/DATALAB-2364
add 0fcb530 [DATALAB-1724]: added necessary for termination tags to project nat route tables, added Name tag for ssn route table
add b582832 [DATALAB-1724]: added Name tag for route table
add a62f5f2 Merge pull request #1138 from apache/DATALAB-1724
new ebc58fd Merge branch 'develop' into DATALAB-2091
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:
infrastructure-provisioning/src/general/lib/aws/actions_lib.py | 4 +++-
.../src/general/scripts/aws/edge_configure_route_table.py | 3 ++-
.../src/general/scripts/aws/project_prepare.py | 4 ++--
.../src/general/scripts/aws/ssn_create_endpoint.py | 1 +
4 files changed, 8 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: Merge branch 'develop' into DATALAB-2091
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit ebc58fdd97cd0047c36e8af9b7d92a48a46b1b88
Merge: b49443a a62f5f2
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Tue Apr 20 14:21:16 2021 +0300
Merge branch 'develop' into DATALAB-2091
infrastructure-provisioning/src/general/lib/aws/actions_lib.py | 4 +++-
.../src/general/scripts/aws/edge_configure_route_table.py | 3 ++-
.../src/general/scripts/aws/project_prepare.py | 4 ++--
.../src/general/scripts/aws/ssn_create_endpoint.py | 1 +
4 files changed, 8 insertions(+), 4 deletions(-)
diff --cc infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index 35fa390,78d497e..c85765d
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@@ -699,10 -700,10 +699,10 @@@ if __name__ == "__main__"
project_conf['nat_rt_name'] = '{0}-{1}-{2}-nat-rt'.format(project_conf['service_base_name'],
project_conf['project_name'],
project_conf['endpoint_name'])
- params = "--vpc_id {} --infra_tag_value {} --edge_instance_id {} --private_subnet_id {}".format(
- project_conf['vpc2_id'], project_conf['nat_rt_name'], edge_instance, subnet_id)
+ params = "--vpc_id {} --infra_tag_value {} --edge_instance_id {} --private_subnet_id {} --sbn {}".format(
+ project_conf['vpc2_id'], project_conf['nat_rt_name'], edge_instance, subnet_id, project_conf['service_base_name'])
try:
- local("~/scripts/{}.py {}".format('edge_configure_route_table', params))
+ subprocess.run("~/scripts/{}.py {}".format('edge_configure_route_table', params), shell=True, check=True)
except:
traceback.print_exc()
raise Exception
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org