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 2022/02/16 13:56:56 UTC

[incubator-datalab] branch 2.5.1-tcpc-deployment updated: [DATALAB-2509]: removed cuda deb file

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch 2.5.1-tcpc-deployment
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git


The following commit(s) were added to refs/heads/2.5.1-tcpc-deployment by this push:
     new 9500abb  [DATALAB-2509]: removed cuda deb file
9500abb is described below

commit 9500abbb65582c2f291326b969eaa909a43215c2
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Feb 16 15:56:42 2022 +0200

    [DATALAB-2509]: removed cuda deb file
---
 .../src/general/lib/os/debian/notebook_lib.py                       | 1 +
 .../src/general/scripts/aws/edge_configure.py                       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
index a746411..01d75e2 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -314,6 +314,7 @@ def install_nvidia_drivers(os_user):
             manage_pkg('-y install', 'remote', 'cuda')
             #clean space on disk
             manage_pkg('clean', 'remote', 'all')
+            datalab.fab.conn.sudo('rm {}'.format(cuda_file_name))
             datalab.fab.conn.sudo('touch /home/{}/.ensure_dir/nvidia_ensured'.format(os_user))
         except Exception as err:
             print('Failed to install_nvidia_drivers: ', str(err))
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 19269e0..d18798a 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -232,14 +232,14 @@ if __name__ == "__main__":
         if os.environ['conf_letsencrypt_enabled'] == 'true' and 'conf_letsencrypt_domain_name' in os.environ:
             edge_conf['edge_hostname'] = '{}.{}'.format(edge_conf['project_name'], os.environ['conf_letsencrypt_domain_name'])
         else:
-            edge_conf['edge_hostname'] = "''"
+            edge_conf['edge_hostname'] = edge_conf['instance_hostname']
         keycloak_params = "--service_base_name {} --keycloak_auth_server_url {} --keycloak_realm_name {} " \
                           "--keycloak_user {} --keycloak_user_password {} --keycloak_client_secret {} " \
-                          "--instance_public_ip {} --hostname {} --project_name {} --endpoint_name {} --hostname {} ".format(
+                          "--instance_public_ip {} --project_name {} --endpoint_name {} --hostname {} ".format(
                            edge_conf['service_base_name'], os.environ['keycloak_auth_server_url'],
                            os.environ['keycloak_realm_name'], os.environ['keycloak_user'],
                            os.environ['keycloak_user_password'], edge_conf['keycloak_client_secret'],
-                           edge_conf['instance_hostname'], edge_conf['instance_hostname'], edge_conf['project_name'],
+                           edge_conf['instance_hostname'], edge_conf['project_name'],
                            edge_conf['endpoint_name'], edge_conf['edge_hostname'])
         try:
             subprocess.run("~/scripts/{}.py {}".format('configure_keycloak', keycloak_params), shell=True, check=True)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org