This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-253
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-253 by this push:
new cb997d6 fixed issue with http proxy on edge node;
cb997d6 is described below
commit cb997d6cb3ac90bbcde1b4decd01f7b0be745356
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Fri Mar 15 14:12:50 2019 +0200
fixed issue with http proxy on edge node;
---
infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py | 4 ++--
infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 678041d..8b132e4 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -79,7 +79,6 @@ if __name__ == "__main__":
GCPMeta().get_static_address(edge_conf['region'],
edge_conf['static_address_name'])['address']
edge_conf['private_ip'] =
GCPMeta().get_private_ip_address(edge_conf['instance_name'])
edge_conf['vpc_cidrs'] = [edge_conf['vpc_cidr']]
- edge_conf['allowed_ip_cidr'] = [edge_conf['vpc_cidr']]
edge_conf['fw_common_name'] =
'{}-{}-ps'.format(edge_conf['service_base_name'], edge_conf['edge_user_name'])
edge_conf['fw_ps_ingress'] =
'{}-ingress'.format(edge_conf['fw_common_name'])
edge_conf['fw_ps_egress_private'] =
'{}-egress-private'.format(edge_conf['fw_common_name'])
@@ -88,6 +87,7 @@ if __name__ == "__main__":
edge_conf['fw_edge_ingress_internal'] =
'{}-ingress-internal'.format(edge_conf['instance_name'])
edge_conf['fw_edge_egress_public'] =
'{}-egress-public'.format(edge_conf['instance_name'])
edge_conf['fw_edge_egress_internal'] =
'{}-egress-internal'.format(edge_conf['instance_name'])
+ edge_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr']
try:
if os.environ['conf_os_family'] == 'debian':
@@ -163,7 +163,7 @@ if __name__ == "__main__":
logging.info('[INSTALLING HTTP PROXY]')
additional_config = {"exploratory_subnet":
edge_conf['private_subnet_cidr'],
"template_file": "/root/templates/squid.conf",
- "edge_user_name": os.environ['edge_user_name'],
+ "edge_user_name": os.environ['gcp_iam_user'],
"ldap_host": os.environ['ldap_hostname'],
"ldap_dn": os.environ['ldap_dn'],
"ldap_user": os.environ['ldap_service_username'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
index 4d2893c..cc5c774 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
@@ -189,7 +189,7 @@ if __name__ == "__main__":
rules = [
{
'IPProtocol': 'tcp',
- 'ports': ['22', '80']
+ 'ports': ['22', '80', '3128']
}
]
ingress_rule['allowed'] = rules
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
