This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1911
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1911 by this push:
new 3a69b9f [DLAB-1911]: replaced space removal with split during azure
security group creation
3a69b9f is described below
commit 3a69b9ffbe077f2a4774735ad93b1afd459d6266
Author: leonidfrolov <frolovl...@gmail.com>
AuthorDate: Tue Sep 29 14:56:46 2020 +0300
[DLAB-1911]: replaced space removal with split during azure security group
creation
---
.../src/general/scripts/azure/project_prepare.py | 4 ++--
infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index 1807ea3..6a74870 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -178,10 +178,10 @@ if __name__ == "__main__":
print('[CREATE SECURITY GROUP FOR EDGE]')
if os.environ['conf_allowed_ip_cidr'] != '0.0.0.0/0' and
project_conf['endpoint_name'] == 'local':
ssn_public_ip =
AzureMeta.get_instance_public_ip_address(project_conf['resource_group_name'],
'{}-ssn'.format(project_conf['service_base_name']))
- project_conf['allowed_ip_cidr'] = "{},
{}/32".format(project_conf['allowed_ip_cidr'], ssn_public_ip).replace(' ','')
+ project_conf['allowed_ip_cidr'] = "{},
{}/32".format(project_conf['allowed_ip_cidr'], ssn_public_ip).split(', ')
elif os.environ['conf_allowed_ip_cidr'] != '0.0.0.0/0' and
project_conf['endpoint_name'] != 'local':
endpoint_public_ip =
AzureMeta.get_instance_public_ip_address(project_conf['resource_group_name'] ,
'{}-{}-endpoint'.format(project_conf['service_base_name'],
project_conf['endpoint_name']))
- project_conf['allowed_ip_cidr'] = "{},
{}/32".format(project_conf['allowed_ip_cidr'], endpoint_public_ip).replace('
','')
+ project_conf['allowed_ip_cidr'] = "{},
{}/32".format(project_conf['allowed_ip_cidr'], endpoint_public_ip).split(', ')
else:
project_conf['allowed_ip_cidr'] = "*"
edge_list_rules = [
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
index 6193dd6..c82cdf7 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_prepare.py
@@ -189,7 +189,7 @@ if __name__ == "__main__":
logging.info('[CREATING SECURITY GROUP]')
print("[CREATING SECURITY GROUP]")
if os.environ['conf_allowed_ip_cidr'] != '0.0.0.0/0':
- ssn_conf['allowed_ip_cidr'] =
"{}".format(os.environ['conf_allowed_ip_cidr']).replace(' ','')
+ ssn_conf['allowed_ip_cidr'] =
"{}".format(os.environ['conf_allowed_ip_cidr']).split(', ')
else:
ssn_conf['allowed_ip_cidr'] = "*"
list_rules = [
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
