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 2021/04/23 13:45:00 UTC
[incubator-datalab] branch DATALAB-2091 updated (302d33c -> db6a53f)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
from 302d33c [DATALAB-2091]: changed zeppelin link from http to https
new 92597d6 [DATALAB-2091]: fixed public key
new a7fb442 [DATALAB-2091]: fixed public key
new db6a53f [DATALAB-2091]: changed link from http to https
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
.../src/general/scripts/azure/dataengine_configure.py | 2 +-
.../src/general/scripts/azure/dataengine_prepare.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_prepare.py | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 02/03: [DATALAB-2091]: fixed public key
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit a7fb44284181bb3600a915f679b712f9e36566ba
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Apr 23 16:01:30 2021 +0300
[DATALAB-2091]: fixed public key
---
.../src/general/scripts/azure/dataengine_configure.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_prepare.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
index 6a917ab..f678c9f 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py
@@ -217,7 +217,7 @@ if __name__ == "__main__":
edge_instance_hostname = data_engine['edge_instance_dns_name']
keyfile_name = "{}{}.pem".format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
key = RSA.importKey(open(keyfile_name, 'rb').read())
- data_engine['public_ssh_key'] = key.publickey().exportKey("OpenSSH")
+ data_engine['public_ssh_key'] = key.publickey().exportKey("OpenSSH").decode('UTF-8')
if os.environ['conf_os_family'] == 'debian':
initial_user = 'ubuntu'
sudo_group = 'sudo'
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
index 6d016b0..83d8740 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_prepare.py
@@ -171,7 +171,7 @@ if __name__ == "__main__":
dataproc_cluster['config']['softwareConfig']['imageVersion'] = dataproc_conf['release_label']
ssh_user_pubkey = open('{}{}.pub'.format(os.environ['conf_key_dir'], dataproc_conf['project_name'])).read()
key = RSA.importKey(open(dataproc_conf['key_path'], 'rb').read())
- ssh_admin_pubkey = key.publickey().exportKey("OpenSSH").decode()
+ ssh_admin_pubkey = key.publickey().exportKey("OpenSSH").decode('UTF-8')
dataproc_cluster['config']['gceClusterConfig']['metadata']['ssh-keys'] = '{0}:{1}{0}:{2}'.format(
dataproc_conf['datalab_ssh_user'], ssh_user_pubkey, ssh_admin_pubkey)
dataproc_cluster['config']['gceClusterConfig']['tags'][0] = dataproc_conf['cluster_tag']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 03/03: [DATALAB-2091]: changed link from http
to https
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit db6a53f200ced218eca51df7088a0e7e30295162
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Apr 23 16:44:48 2021 +0300
[DATALAB-2091]: changed link from http to https
---
infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 a1d691b..3039caf 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -305,7 +305,7 @@ def install_tensor(os_user, cuda_version, cuda_file_name,
# legacy support for old kernels
datalab.fab.conn.sudo(''' bash -c 'if [[ $(apt-cache search linux-image-`uname -r`) ]]; then apt-get -y '''
'''install linux-image-`uname -r`; else apt-get -y install linux-modules-`uname -r`; fi;' ''')
- datalab.fab.conn.sudo('wget http://us.download.nvidia.com/tesla/{0}/NVIDIA-Linux-x86_64-{0}.run -O '
+ datalab.fab.conn.sudo('wget https://us.download.nvidia.com/tesla/{0}/NVIDIA-Linux-x86_64-{0}.run -O '
'/home/{1}/NVIDIA-Linux-x86_64-{0}.run'.format(nvidia_version, os_user))
datalab.fab.conn.sudo('/bin/bash /home/{0}/NVIDIA-Linux-x86_64-{1}.run -s --dkms'.format(os_user, nvidia_version))
datalab.fab.conn.sudo('rm -f /home/{0}/NVIDIA-Linux-x86_64-{1}.run'.format(os_user, nvidia_version))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/03: [DATALAB-2091]: fixed public key
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2091
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit 92597d64dbb2a3ca49d4b247a7e77a1b46395ed1
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Fri Apr 23 15:59:07 2021 +0300
[DATALAB-2091]: fixed public key
---
.../src/general/scripts/azure/dataengine_prepare.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
index 4727f1d..995b7d0 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
@@ -83,7 +83,7 @@ if __name__ == "__main__":
data_engine['master_size'] = os.environ['azure_dataengine_master_size']
key = RSA.importKey(open('{}{}.pem'.format(os.environ['conf_key_dir'],
os.environ['conf_key_name']), 'rb').read())
- data_engine['public_ssh_key'] = key.publickey().exportKey("OpenSSH")
+ data_engine['public_ssh_key'] = key.publickey().exportKey("OpenSSH").decode('UTF-8')
data_engine['instance_count'] = int(os.environ['dataengine_instance_count'])
data_engine['slave_size'] = os.environ['azure_dataengine_slave_size']
data_engine['instance_storage_account_type'] = 'Premium_LRS'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org