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
The following commit(s) were added to refs/heads/DATALAB-2091 by this push:
new 6c8f627 [DATALAB-2386]: fixed some vars names
6c8f627 is described below
commit 6c8f6279a4ab5a79db644ddb4c85cf0678b5ca47
Author: leonidfrolov <[email protected]>
AuthorDate: Wed May 5 17:52:03 2021 +0300
[DATALAB-2386]: fixed some vars names
---
.../src/dataengine/scripts/configure_dataengine.py | 2 +-
infrastructure-provisioning/src/general/lib/os/fab.py | 2 +-
.../src/ssn/scripts/configure_ui.py | 18 +++++++++---------
3 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
b/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
index b4045a4..19423cf 100644
--- a/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
+++ b/infrastructure-provisioning/src/dataengine/scripts/configure_dataengine.py
@@ -200,7 +200,7 @@ if __name__ == "__main__":
# INSTALL LIVY
if not exists(conn,
'/home/{0}/.ensure_dir/livy_ensured'.format(args.os_user)):
conn.sudo('wget -P /tmp/ --user={} --password={} '
- 'https://{}/repository/packages/livy.tar.gz
--no-check-certificate'
+ '{}/repository/packages/livy.tar.gz --no-check-certificate'
.format(os.environ['conf_repository_user'],
os.environ['conf_repository_pass'],
os.environ['conf_repository_address']))
conn.sudo('tar -xzvf /tmp/livy.tar.gz -C /tmp/')
diff --git a/infrastructure-provisioning/src/general/lib/os/fab.py
b/infrastructure-provisioning/src/general/lib/os/fab.py
index 241f764..b116f7e 100644
--- a/infrastructure-provisioning/src/general/lib/os/fab.py
+++ b/infrastructure-provisioning/src/general/lib/os/fab.py
@@ -772,7 +772,7 @@ def configure_data_engine_service_livy(hostname, os_user,
keyfile):
if exists(conn,'/usr/local/lib/livy'):
conn.sudo('rm -r /usr/local/lib/livy')
conn.sudo('wget -P /tmp/ --user={} --password={} '
- 'https://{}/repository/packages/livy.tar.gz
--no-check-certificate'
+ '{}/repository/packages/livy.tar.gz
--no-check-certificate'
.format(os.environ['conf_repository_user'],
os.environ['conf_repository_pass'],
os.environ['conf_repository_address']))
conn.sudo('tar -xzvf /tmp/livy.tar.gz -C /usr/local/lib/')
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index d7e1ca5..f185eee 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -159,18 +159,18 @@ def build_ui():
conn.sudo('sudo chown -R {} {}/*'.format(args.os_user,
args.datalab_path))
# Building Back-end
- if 'repository_user' in os.environ and 'repository_pass' in os.environ
and 'repository_address' in os.environ:
+ if 'conf_repository_user' in os.environ and 'conf_repository_pass' in
os.environ and 'conf_repository_address' in os.environ:
conn.sudo(
- 'wget -P {}sources/services/provisioning-service/target/
--user={} --password={}
https://{}/repository/packages/provisioning-service-2.4.jar
--no-check-certificate'
- .format(args.datalab_path, os.environ['repository_user'],
os.environ['repository_pass'], os.environ['repository_address']))
+ 'wget -P {}sources/services/provisioning-service/target/
--user={} --password={} {}/repository/packages/provisioning-service-2.4.jar
--no-check-certificate'
+ .format(args.datalab_path,
os.environ['conf_repository_user'], os.environ['conf_repository_pass'],
os.environ['conf_repository_address']))
conn.sudo(
- 'wget -P {}sources/services/self-service/target/ --user={}
--password={} https://{}/repository/packages/self-service-2.4.jar
--no-check-certificate'
- .format(args.datalab_path, os.environ['repository_user'],
os.environ['repository_pass'],
- os.environ['repository_address']))
+ 'wget -P {}sources/services/self-service/target/ --user={}
--password={} {}/repository/packages/self-service-2.4.jar
--no-check-certificate'
+ .format(args.datalab_path, os.environ['conf_repository_user'],
os.environ['conf_repository_pass'],
+ os.environ['conf_repository_address']))
conn.sudo(
- 'wget -P {0}sources/services/billing-{4}/target/ --user={1}
--password={2} https://{3}/repository/packages/billing-{4}-2.4.jar
--no-check-certificate'
- .format(args.datalab_path, os.environ['repository_user'],
os.environ['repository_pass'],
- os.environ['repository_address'], args.cloud_provider))
+ 'wget -P {0}sources/services/billing-{4}/target/ --user={1}
--password={2} {3}/repository/packages/billing-{4}-2.4.jar
--no-check-certificate'
+ .format(args.datalab_path, os.environ['conf_repository_user'],
os.environ['conf_repository_pass'],
+ os.environ['conf_repository_address'],
args.cloud_provider))
else:
try:
conn.sudo('bash -c "cd {}sources/ && /opt/maven/bin/mvn -P{}
-DskipTests package 2>&1 > /tmp/maven.log"'.format(args.datalab_path,
args.cloud_provider))
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
