This is an automated email from the ASF dual-hosted git repository.
mykolabodnar pushed a commit to branch DLAB-515
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-515 by this push:
new c722d73 [DLAB-515]: [AWS] Notebook creation fixed
c722d73 is described below
commit c722d73bc04f0764b2a89d8225e9e04fe473518f
Author: bodnarmykola <[email protected]>
AuthorDate: Tue Apr 14 00:14:02 2020 +0300
[DLAB-515]: [AWS] Notebook creation fixed
---
.../src/general/lib/os/debian/edge_lib.py | 1 -
.../src/ssn/scripts/configure_ssn_node.py | 10 ++++++++++
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
index 051945c..3d5773e 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/edge_lib.py
@@ -52,7 +52,6 @@ def configure_http_proxy_server(config):
replace_string += 'acl AllowedCIDRS src {}\\n'.format(cidr)
sudo('sed -i "s|ALLOWED_CIDRS|{}|g"
/etc/squid/squid.conf'.format(replace_string))
sudo('systemctl restart squid')
-
sudo('touch /tmp/http_proxy_ensured')
except Exception as err:
print("Failed to install and configure squid: " + str(err))
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 42a6a09..0fbe388 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -50,6 +50,13 @@ def set_hostname(subdomain, hosted_zone_name):
print('Failed to set hostname: ', str(err))
sys.exit(1)
+def set_resolve():
+ try:
+ sudo('ln -sf /run/systemd/resolve/resolv.conf /etc/resolv.conf')
+ except Exception as err:
+ traceback.print_exc()
+ print('Failed to set resolve: ', str(err))
+ sys.exit(1)
def cp_key(keyfile, host_string, os_user):
try:
@@ -223,6 +230,9 @@ if __name__ == "__main__":
else:
custom_ssl_cert = False
+ print('Setting resolve DNS configuration')
+ set_resolve()
+
print("Creating service directories.")
creating_service_directories(args.dlab_path, args.os_user)
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]