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 91c734f [DLAB-515] - Dataproc version fixed
91c734f is described below
commit 91c734f14253500282cb4e6468d05f1f4669f031
Author: bodnarmykola <[email protected]>
AuthorDate: Wed Jun 17 08:26:27 2020 +0300
[DLAB-515] - Dataproc version fixed
---
.../src/general/files/gcp/dataengine-service_description.json | 3 +--
infrastructure-provisioning/src/general/lib/os/fab.py | 6 ++++++
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
b/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
index 3959dc9..fa90258 100644
---
a/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
+++
b/infrastructure-provisioning/src/general/files/gcp/dataengine-service_description.json
@@ -25,7 +25,6 @@
},
"templates":
[
- {"version":"1.4-ubuntu18", "applications": [{"Name":"Hadoop", "Version":
"2.9.2"}, {"Name":"Spark", "Version": "2.4.5"}, {"Name":"Hive", "Version":
"2.3.6"}]},
- {"version":"1.5-ubuntu18", "applications": [{"Name":"Hadoop", "Version":
"2.10.0"}, {"Name":"Spark", "Version": "2.4.5"}, {"Name":"Hive", "Version":
"2.3.6"}]}
+ {"version":"1.5-debian10", "applications": [{"Name":"Hadoop", "Version":
"2.10.0"}, {"Name":"Spark", "Version": "2.4.5"}, {"Name":"Hive", "Version":
"2.3.6"}]}
]
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py
b/infrastructure-provisioning/src/general/lib/os/fab.py
index 4ac5806..0f75b5e 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -647,11 +647,17 @@ def configure_data_engine_service_pip(hostname, os_user,
keyfile):
if not exists('/usr/bin/pip2'):
sudo('ln -s /usr/bin/pip-2.7 /usr/bin/pip2')
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')
sudo('echo "export PATH=$PATH:/usr/local/bin" >> /etc/profile')
sudo('source /etc/profile')
run('source /etc/profile')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]