This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DATALAB-2414
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
The following commit(s) were added to refs/heads/DATALAB-2414 by this push:
new 009c293 [DATALAB-2414]: remade some vars definition
009c293 is described below
commit 009c293244826b90cc01f47b936a5950a11e6f3a
Author: leonidfrolov <[email protected]>
AuthorDate: Mon Jun 14 12:46:57 2021 +0300
[DATALAB-2414]: remade some vars definition
---
.../src/dataengine/scripts/configure_dataengine.py | 2 +-
.../src/general/lib/os/debian/notebook_lib.py | 10 ++++------
2 files changed, 5 insertions(+), 7 deletions(-)
diff --git
a/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
b/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
index 597a3a9..7218cb9 100644
--- a/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
+++ b/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
@@ -213,7 +213,7 @@ if __name__ == "__main__":
conn.sudo('mv /tmp/incubator-livy /opt/livy')
conn.sudo('mkdir /var/log/livy')
conn.put('/root/templates/livy-env.sh', '/tmp/livy-env.sh')
- conn.sudo("sed -i 's|python3|{}|'
/tmp/livy-env.sh".format(python_venv_path))
+ conn.sudo("sed -i 's|=python3|={}|'
/tmp/livy-env.sh".format(python_venv_path))
conn.sudo('mv /tmp/livy-env.sh /opt/livy/conf/livy-env.sh')
conn.sudo('chown -R -L {0}:{0} /opt/livy/'.format(args.os_user))
conn.sudo('chown -R {0}:{0} /var/log/livy'.format(args.os_user))
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 0274153..df11ceb 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/notebook_lib.py
@@ -125,10 +125,6 @@ def ensure_r(os_user, r_libs, region, r_mirror):
def install_rstudio(os_user, local_spark_path, rstudio_pass, rstudio_version,
python_venv_version=''):
if not exists(datalab.fab.conn,'/home/' + os_user +
'/.ensure_dir/rstudio_ensured'):
try:
- python_venv_path =
'/opt/python/python{0}/bin/python{1}'.format(python_venv_version,
-
python_venv_version[:3])
- python_venv_lib_path =
'/opt/python/python{0}/lib/'.format(python_venv_version,
-
python_venv_version[:3])
manage_pkg('-y install', 'remote', 'r-base')
manage_pkg('-y install', 'remote', 'gdebi-core')
datalab.fab.conn.sudo('wget
https://download2.rstudio.org/server/bionic/amd64/rstudio-server-{}-amd64.deb'.format(rstudio_version))
@@ -154,9 +150,11 @@ def install_rstudio(os_user, local_spark_path,
rstudio_pass, rstudio_version, py
datalab.fab.conn.sudo('chown {0}:{0}
/home/{0}/.Renviron'.format(os_user))
datalab.fab.conn.sudo('''echo 'SPARK_HOME="{0}"' >>
/home/{1}/.Renviron'''.format(local_spark_path, os_user))
datalab.fab.conn.sudo('''echo 'JAVA_HOME="{0}"' >>
/home/{1}/.Renviron'''.format(java_home, os_user))
- datalab.fab.conn.sudo('''echo 'RETICULATE_PYTHON="{0}"' >>
/home/{1}/.Renviron'''.format(python_venv_path, os_user))
datalab.fab.conn.sudo(
- '''echo 'LD_LIBRARY_PATH="{0}"' >>
/home/{1}/.Renviron'''.format(python_venv_lib_path, os_user))
+ '''echo
'RETICULATE_PYTHON="/opt/python/python{0}/bin/python{1}"' >>
/home/{2}/.Renviron'''.format(
+ python_venv_version, python_venv_version[:3], os_user))
+ datalab.fab.conn.sudo(
+ '''echo 'LD_LIBRARY_PATH="/opt/python/python{0}/lib/"' >>
/home/{1}/.Renviron'''.format(python_venv_version, os_user))
datalab.fab.conn.sudo('touch /home/{}/.Rprofile'.format(os_user))
datalab.fab.conn.sudo('chown {0}:{0}
/home/{0}/.Rprofile'.format(os_user))
datalab.fab.conn.sudo('''echo 'library(SparkR, lib.loc =
c(file.path(Sys.getenv("SPARK_HOME"), "R", "lib")))' >>
/home/{}/.Rprofile'''.format(os_user))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
