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 d8d24bd  [DLAB-515] [GCP] Dadaproc deployment fixed
d8d24bd is described below

commit d8d24bd0cc495108fd88d1abcfe614ccd6ded3ce
Author: bodnarmykola <[email protected]>
AuthorDate: Tue Aug 4 18:25:40 2020 +0300

    [DLAB-515] [GCP] Dadaproc deployment fixed
---
 infrastructure-provisioning/src/general/lib/os/fab.py                | 5 +----
 .../general/scripts/gcp/jupyter_dataengine-service_create_configs.py | 2 +-
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py 
b/infrastructure-provisioning/src/general/lib/os/fab.py
index 2c20b43..df8cbe1 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -720,17 +720,14 @@ def configure_data_engine_service_pip(hostname, os_user, 
keyfile, emr=False):
             manage_pkg('-y install', 'remote', 'python2-pip')
         else:
             sudo('ln -s /usr/bin/pip-2.7 /usr/bin/pip2')
+    manage_pkg('-y install', 'remote', 'python3-pip')
     if not exists('/usr/bin/pip3') and sudo("python3.4 -V 2>/dev/null | awk 
'{print $2}'"):
-        manage_pkg('-y install', 'remote', 'python3-pip')
         sudo('ln -s /usr/bin/pip-3.4 /usr/bin/pip3')
     elif not exists('/usr/bin/pip3') and sudo("python3.5 -V 2>/dev/null | awk 
'{print $2}'"):
-        manage_pkg('-y install', 'remote', 'python3-pip')
         sudo('ln -s /usr/bin/pip-3.5 /usr/bin/pip3')
     elif not exists('/usr/bin/pip3') and sudo("python3.6 -V 2>/dev/null | awk 
'{print $2}'"):
-        manage_pkg('-y install', 'remote', 'python3-pip')
         sudo('ln -s /usr/bin/pip-3.6 /usr/bin/pip3')
     elif not exists('/usr/bin/pip3') and sudo("python3.7 -V 2>/dev/null | awk 
'{print $2}'"):
-        manage_pkg('-y install', 'remote', 'python3-pip')
         sudo('ln -s /usr/bin/pip-3.7 /usr/bin/pip3')
     if emr:
         sudo('pip3 install -U pip=={}'.format(os.environ['conf_pip_version']))
diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
 
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
index 30ee470..2e7929c 100644
--- 
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
+++ 
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_dataengine-service_create_configs.py
@@ -124,7 +124,7 @@ def install_sparkamagic_kernels(args):
                                                                          
args.cluster_name)
         local('sed -i \'s|PySpark|{0}|g\' 
/home/{1}/.local/share/jupyter/kernels/pysparkkernel/kernel.json'.format(
             pyspark_kernel_name, args.os_user))
-        spark_kernel_name = 'PySpark (Scala-{0} / Spark-{1} ) 
[{2}]'.format(args.scala_version, args.spark_version,
+        spark_kernel_name = 'Spark (Scala-{0} / Spark-{1} ) 
[{2}]'.format(args.scala_version, args.spark_version,
                                                                          
args.cluster_name)
         local('sed -i \'s|Spark|{0}|g\' 
/home/{1}/.local/share/jupyter/kernels/sparkkernel/kernel.json'.format(
             spark_kernel_name, args.os_user))


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to