This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1546 by this push:
new 0742f2c [DLAB-1546]: added name convention changes
0742f2c is described below
commit 0742f2cf6544e2b9abcbe052bf658a6da955ae73
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Mon Mar 2 14:53:50 2020 +0200
[DLAB-1546]: added name convention changes
---
.../src/general/scripts/gcp/project_prepare.py | 4 ++--
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index 2567b78..d629add 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -323,7 +323,7 @@ if __name__ == "__main__":
]
ingress_rule['sourceRanges'] = [project_conf['private_subnet_cidr'],
GCPMeta.get_subnet(project_conf['subnet_name'],
-
project_conf['region'])['ipCidrRange']
+
project_conf['region'])['ipCidrRange']
]
rules = [
{
@@ -342,7 +342,7 @@ if __name__ == "__main__":
]
egress_rule['destinationRanges'] =
[project_conf['private_subnet_cidr'],
GCPMeta.get_subnet(project_conf['subnet_name'],
-
project_conf['region'])['ipCidrRange']
+
project_conf['region'])['ipCidrRange']
]
rules = [
{
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 8feb2a5..3a2026d 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -92,7 +92,7 @@ if __name__ == "__main__":
ssn_conf['pre_defined_subnet'] = True
ssn_conf['subnet_name'] = os.environ['gcp_subnet_name']
except KeyError:
- ssn_conf['subnet_name'] =
'{}-ssn-subnet'.format(ssn_conf['service_base_name'])
+ ssn_conf['subnet_name'] =
'{}-subnet'.format(ssn_conf['service_base_name'])
try:
if os.environ['gcp_firewall_name'] == '':
raise KeyError
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]