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/02/22 12:39:33 UTC
[incubator-datalab] branch DATALAB-2091 updated (84d85f8 -> f7fd92e)
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 84d85f8 [DATALAB-2091]: fixed some directing echo output to files owned by root
new 1a3607b [DATALAB-2091]: removed unnecessary list
new be3b013 [DATALAB-2091]: fixed syntax error
new f7fd92e [DATALAB-2091]: fixed syntax error
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:
.../scripts/deploy_repository/deploy_repository.py | 2 +-
infrastructure-provisioning/src/base/scripts/install_user_key.py | 2 +-
infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py | 2 +-
.../src/edge/scripts/configure_nginx_reverse_proxy.py | 2 +-
infrastructure-provisioning/src/general/lib/azure/actions_lib.py | 4 ++--
infrastructure-provisioning/src/general/lib/os/debian/common_lib.py | 1 -
.../src/general/scripts/aws/dataengine-service_configure.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_configure.py | 2 +-
.../src/project/scripts/configure_http_proxy.py | 2 +-
infrastructure-provisioning/src/project/scripts/configure_nftables.py | 2 +-
.../src/project/scripts/configure_nginx_reverse_proxy.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 2 +-
14 files changed, 14 insertions(+), 15 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 syntax error
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 be3b013203628135439a91a32320557933a04bf2
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Feb 22 14:37:35 2021 +0200
[DATALAB-2091]: fixed syntax error
---
infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
index 8eabe35..c504683 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ssn_node.py
@@ -214,7 +214,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
host_string = args.os_user + '@' + args.hostname
deeper_config = json.loads(args.additional_config)
except:
---------------------------------------------------------------------
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]: fixed syntax error
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 f7fd92eab1f726c3aceb4cc6774f4a3df354cd20
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Feb 22 14:39:19 2021 +0200
[DATALAB-2091]: fixed syntax error
---
.../scripts/deploy_repository/deploy_repository.py | 2 +-
infrastructure-provisioning/src/base/scripts/install_user_key.py | 2 +-
infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py | 2 +-
.../src/edge/scripts/configure_nginx_reverse_proxy.py | 2 +-
infrastructure-provisioning/src/general/lib/azure/actions_lib.py | 4 ++--
.../src/general/scripts/aws/dataengine-service_configure.py | 2 +-
.../src/general/scripts/gcp/dataengine-service_configure.py | 2 +-
.../src/project/scripts/configure_http_proxy.py | 2 +-
infrastructure-provisioning/src/project/scripts/configure_nftables.py | 2 +-
.../src/project/scripts/configure_nginx_reverse_proxy.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_docker.py | 2 +-
infrastructure-provisioning/src/ssn/scripts/configure_ui.py | 2 +-
12 files changed, 13 insertions(+), 13 deletions(-)
diff --git a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index b540703..629fdb2 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -1691,7 +1691,7 @@ if __name__ == "__main__":
print("CONFIGURE CONNECTIONS")
global conn
- conn = datalab.fab.init_datalab_connection(ec2_ip_address, 'ubuntu', key_filename)
+ conn = datalab.fab.init_datalab_connection(ec2_ip_address, 'ubuntu', key_filename)
print("CONFIGURE LOCAL REPOSITORY")
try:
print('CREATING DATALAB USER')
diff --git a/infrastructure-provisioning/src/base/scripts/install_user_key.py b/infrastructure-provisioning/src/base/scripts/install_user_key.py
index c9873f5..32d7a53 100644
--- a/infrastructure-provisioning/src/base/scripts/install_user_key.py
+++ b/infrastructure-provisioning/src/base/scripts/install_user_key.py
@@ -61,7 +61,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
deeper_config = json.loads(args.additional_config)
except:
print('Fail connection')
diff --git a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
index 4c8a09b..3580b43 100644
--- a/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
+++ b/infrastructure-provisioning/src/edge/scripts/configure_http_proxy.py
@@ -42,7 +42,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
deeper_config = json.loads(args.additional_config)
except:
sys.exit(2)
diff --git a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
index c3bffce..6513db8 100644
--- a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
+++ b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
@@ -47,7 +47,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
except Exception as err:
print("Failed establish connection. Excpeption: " + str(err))
sys.exit(1)
diff --git a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
index e0a2204..eb80145 100644
--- a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
@@ -1223,7 +1223,7 @@ def configure_dataengine_spark(cluster_name, jars_dir, cluster_dir, datalake_ena
def remount_azure_disk(creds=False, os_user='', hostname='', keyfile=''):
if creds:
global conn
- conn = datalab.fab.init_datalab_connection(hostname, os_user, keyfile)
+ conn = datalab.fab.init_datalab_connection(hostname, os_user, keyfile)
conn.sudo('sed -i "/azure_resource-part1/ s|/mnt|/media|g" /etc/fstab')
conn.sudo('grep "azure_resource-part1" /etc/fstab > /dev/null && umount -f /mnt/ || true')
conn.sudo('mount -a')
@@ -1234,7 +1234,7 @@ def remount_azure_disk(creds=False, os_user='', hostname='', keyfile=''):
def prepare_vm_for_image(creds=False, os_user='', hostname='', keyfile=''):
if creds:
global conn
- conn = datalab.fab.init_datalab_connection(hostname, os_user, keyfile)
+ conn = datalab.fab.init_datalab_connection(hostname, os_user, keyfile)
conn.sudo('waagent -deprovision -force')
if creds:
conn.close()
diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
index a2aed77..9a1f418 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py
@@ -83,7 +83,7 @@ def configure_dataengine_service(instance, emr_conf):
datalab.fab.configure_data_engine_service_pip(emr_conf['instance_ip'], emr_conf['os_user'],
emr_conf['key_path'], True)
global conn
- conn = datalab.fab.init_datalab_connection(emr_conf['instance_ip'], emr_conf['os_user'], emr_conf['key_path'])
+ conn = datalab.fab.init_datalab_connection(emr_conf['instance_ip'], emr_conf['os_user'], emr_conf['key_path'])
conn.sudo('echo "[main]" > /etc/yum/pluginconf.d/priorities.conf ; echo "enabled = 0" >> '
'/etc/yum/pluginconf.d/priorities.conf')
manage_pkg('-y install', 'remote', 'R-devel')
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
index 98a1f39..bd503fc 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py
@@ -60,7 +60,7 @@ def configure_dataengine_service(instance, dataproc_conf):
print('[CONFIGURE DATAENGINE SERVICE]')
try:
global conn
- conn = datalab.fab.init_datalab_connection(dataproc_conf['instance_ip'], dataproc_conf['datalab_ssh_user'], dataproc_conf['key_path'])
+ conn = datalab.fab.init_datalab_connection(dataproc_conf['instance_ip'], dataproc_conf['datalab_ssh_user'], dataproc_conf['key_path'])
datalab.notebook_lib.install_os_pkg([['python3-pip', 'N/A']])
datalab.fab.configure_data_engine_service_pip(dataproc_conf['instance_ip'],
dataproc_conf['datalab_ssh_user'],
diff --git a/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
index c6b70ca..8562969 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_http_proxy.py
@@ -41,7 +41,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
deeper_config = json.loads(args.additional_config)
except:
sys.exit(2)
diff --git a/infrastructure-provisioning/src/project/scripts/configure_nftables.py b/infrastructure-provisioning/src/project/scripts/configure_nftables.py
index 61c8e6a..f9afa4e 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_nftables.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_nftables.py
@@ -41,7 +41,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
deeper_config = json.loads(args.additional_config)
except:
sys.exit(2)
diff --git a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
index c014f1d..cb0407c 100644
--- a/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
+++ b/infrastructure-provisioning/src/project/scripts/configure_nginx_reverse_proxy.py
@@ -50,7 +50,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.user, args.keyfile)
except Exception as err:
print("Failed establish connection. Excpeption: " + str(err))
sys.exit(1)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
index 7f5049f..a201393 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_docker.py
@@ -190,7 +190,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
deeper_config = json.loads(args.additional_config)
except:
sys.exit(2)
diff --git a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
index 12d2da5..7d6becd 100644
--- a/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
+++ b/infrastructure-provisioning/src/ssn/scripts/configure_ui.py
@@ -205,7 +205,7 @@ if __name__ == "__main__":
print("Configure connections")
try:
global conn
- conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
+ conn = datalab.fab.init_datalab_connection(args.hostname, args.os_user, args.keyfile)
host_string = args.os_user + '@' + args.hostname
deeper_config = json.loads(args.additional_config)
except:
---------------------------------------------------------------------
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]: removed unnecessary list
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 1a3607b5119a5d51214abe27e350fde33adde7b4
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Feb 22 14:24:28 2021 +0200
[DATALAB-2091]: removed unnecessary list
---
infrastructure-provisioning/src/general/lib/os/debian/common_lib.py | 1 -
1 file changed, 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
index de6f695..1711520 100644
--- a/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
+++ b/infrastructure-provisioning/src/general/lib/os/debian/common_lib.py
@@ -66,7 +66,6 @@ def manage_pkg(command, environment, requisites):
datalab.fab.conn.sudo('apt update')
datalab.fab.conn.sudo('apt-get {0} {1} 2>&1 | tee /tmp/tee.tmp; if ! grep -w -E "({2})" /tmp/tee.tmp > '
'/tmp/apt.log; then echo "no_error" > /tmp/apt.log;fi'.format(command, requisites, error_parser))
- datalab.fab.conn.sudo('ls -la /tmp/')
err = datalab.fab.conn.sudo('cat /tmp/apt.log').stdout
count = 0
while 'no_error' not in err and count < 10:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org