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/10/19 12:13:12 UTC

[incubator-datalab] branch develop updated (67b88af -> 50c664d)

This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.


    from 67b88af  Merge pull request #1303 from MarianHladun/DATALAB-2541
     add 3909b18  [DATALAB-2409] - DataLab deployment script refactored
     add 2c08eb6  [DATALAB-2409] - DataLab deployment script refactored
     add 6bbd6d4  [DATALAB-2409] - DataLab deployment script refactored
     add 1affbad  [DATALAB-2409] - DataLab deployment script refactored
     add 2a79c95  [DATALAB-2409] - DataLab deployment script refactored
     add 4d7973f  [DATALAB-2409] - DataLab deployment script refactored
     add 7f7664a  [DATALAB-2409] - DataLab deployment script refactored
     add 9a1ad55  [DATALAB-2409] - [AWS] SSN prepare refactored
     add 66234cd  [DATALAB-2409] - [AWS] SSN prepare refactored
     add 3730f8c  [DATALAB-2409] - [AWS] SSN prepare refactored
     add e0fd507  [DATALAB-2409] - [AWS] SSN prepare refactored
     add 0f2d9bd  [DATALAB-2409] - [AWS] SSN prepare refactored
     add 1878f62  [DATALAB-2409] - [AWS] SSN configure refactored
     add ac35f79  [DATALAB-2409] - [AWS] SSN configure refactored
     add cc06a12  [DATALAB-2409] - [AWS] SSN configure refactored
     add 2311ce9  [DATALAB-2409] - [AWS] SSN configure refactored
     add 39ce527  [DATALAB-2409] - [AWS] SSN configure refactored
     add 8ba5f02  [DATALAB-2409] - [AWS] SSN configure refactored
     add 5eb6f2f  [DATALAB-2409] - [AWS] SSN configure refactored
     add 375dc79  [DATALAB-2409] - [AWS] SSN configure refactored
     add f18a085  [DATALAB-2409] - [AWS] SSN termination script refactored
     add 2d0e3fb  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add 3f329f8  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add b138868  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add 7dd6eef  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add 6c233d0  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add ec18b47  [DATALAB-2409] -logging refactored
     add 38965e5  [DATALAB-2409] -logging refactored
     add 21dea8e  [DATALAB-2409] -logging refactored
     add 8bdcdce  [DATALAB-2409] - logging refactored
     add 8c95614  [DATALAB-2409] - logging refactored
     add 18daf03  [DATALAB-2409] - logging refactored
     add a1e03e2  [DATALAB-2409] - logging refactored
     add d9ccf3b  [DATALAB-2409] - logging refactored
     add ece2a0a  [DATALAB-2409] - logging refactored
     add 71b4863  [DATALAB-2409] - logging refactored
     add 1e2f505  [DATALAB-2409] - logging refactored
     add 061ddf3  [DATALAB-2409] - logging refactored
     add 477b66b  [DATALAB-2409] - logging refactored
     add 7af7016  [DATALAB-2409] - fab.py refactored
     add 5c1abdb  [DATALAB-2409] - configure mongo fixed
     add 26e9b26  [DATALAB-2409] - debian common lib refactored
     add bb740f7  [DATALAB-2409] - debian edge lib refactored
     add 2bd0a55  [DATALAB-2409] - edge lib refactored
     add 4e9bea7  [DATALAB-2409]: replaced all prints by logging for aws
     add 201897e  [DATALAB-2409]: added repo port argument
     add c62ddaf  [DATALAB-2409]: added jars argument
     add d6e654a  [DATALAB-2409]: added default values for arguments
     add 95fd775  [DATALAB-2409]: fixed function call
     add 8fc45c9  [DATALAB-2409]: removed logging duplicate
     add a003486  [DATALAB-2409]: fixed sed for managing /opt mount on azure
     add f891e72  [DATALAB-2409]: removed r_mirror usage
     add c71563c  [DATALAB-2409]: fixed ipykernel version variable
     add 223289c  [DATALAB-2409]: fixed scikit_learn version variable
     add 66eb986  [DATALAB-2409] - DataLab deployment script refactored
     add 24093cc  [DATALAB-2409] - DataLab deployment script refactored
     add 4bd67bd  [DATALAB-2409] - DataLab deployment script refactored
     add 8d01786  [DATALAB-2409] - DataLab deployment script refactored
     add cb8d9c6  [DATALAB-2409] - DataLab deployment script refactored
     add b123a20  [DATALAB-2409] - DataLab deployment script refactored
     add e793854  [DATALAB-2409] - DataLab deployment script refactored
     add f50b62f  [DATALAB-2409] - [AWS] SSN prepare refactored
     add ded97f9  [DATALAB-2409] - [AWS] SSN prepare refactored
     add e89a155  [DATALAB-2409] - [AWS] SSN prepare refactored
     add 2859b78  [DATALAB-2409] - [AWS] SSN prepare refactored
     add 80b4548  [DATALAB-2409] - [AWS] SSN prepare refactored
     add a0af74d  [DATALAB-2409] - [AWS] SSN configure refactored
     add 7e4a05e  [DATALAB-2409] - [AWS] SSN configure refactored
     add f27fb7d  [DATALAB-2409] - [AWS] SSN configure refactored
     add 05e83dc  [DATALAB-2409] - [AWS] SSN configure refactored
     add b2e0a4f  [DATALAB-2409] - [AWS] SSN configure refactored
     add dc1051a  [DATALAB-2409] - [AWS] SSN configure refactored
     add 9d0e06f  [DATALAB-2409] - [AWS] SSN configure refactored
     add b0b34c6  [DATALAB-2409] - [AWS] SSN configure refactored
     add 522cab5  [DATALAB-2409] - [AWS] SSN termination script refactored
     add f5b905b  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add 3f6289d  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add bb1a367  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add a71b065  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add 9b6b3a7  [DATALAB-2409] - [AWS] SSN configuration script refactored
     add ef5d4e8  [DATALAB-2409] -logging refactored
     add 00fa900  [DATALAB-2409] -logging refactored
     add 25ea16a  [DATALAB-2409] -logging refactored
     add 62083b1  [DATALAB-2409] - logging refactored
     add 849aa21  [DATALAB-2409] - logging refactored
     add 988a8f3  [DATALAB-2409] - logging refactored
     add 3258177  [DATALAB-2409] - logging refactored
     add 037fd62  [DATALAB-2409] - logging refactored
     add 66e99b8  [DATALAB-2409] - logging refactored
     add 5260b29  [DATALAB-2409] - logging refactored
     add 40ffebe  [DATALAB-2409] - logging refactored
     add d0095d5  [DATALAB-2409] - logging refactored
     add f043904  [DATALAB-2409] - logging refactored
     add 8ecd2ce  [DATALAB-2409] - fab.py refactored
     add c646975  [DATALAB-2409] - configure mongo fixed
     add 5f241f1  [DATALAB-2409] - debian common lib refactored
     add 6ca8653  [DATALAB-2409] - debian edge lib refactored
     add 645e7b6  [DATALAB-2409] - edge lib refactored
     add 7c06edf  Merge branch 'develop' into DATALAB-2409
     add f95bb56  [DATALAB-2409]: replaced all prints by logging for aws
     add 8226a23  Merge branch 'develop' into DATALAB-2409
     add b16457c  [DATALAB-2409]: added repo port argument
     add 5a4442d  [DATALAB-2409]: added jars argument
     add 0ddff6e  [DATALAB-2409]: added default values for arguments
     add 160e3c5  [DATALAB-2409]: fixed function call
     add 3fe53c9  [DATALAB-2409]: removed logging duplicate
     add 2f278fb  [DATALAB-2409]: fixed sed for managing /opt mount on azure
     add 4461c32  [DATALAB-2409]: removed r_mirror usage
     add 3033891  [DATALAB-2409]: fixed ipykernel version variable
     add e885bad  [DATALAB-2409]: fixed scikit_learn version variable
     add e9d68c9  [DATALAB-2409]: fixed merge conflicts
     add 13c4931  [DATALAB-2409]: fixed merge conflicts
     add 6a63f18  [DATALAB-2409]: removed print
     add 53efbf6  [DATALAB-2409]: merged develop
     add b3d6d55  [DATALAB-2409]: replaced print with logging in all general/scripts/azure .py scripts
     add 58e2303  [DATALAB-2409]: replaced print with logging in all general/scripts/gcp .py scripts
     add 0c304cc  [DATALAB-2409]: replaced print with logging in all general/scripts/os .py scripts
     add b20a735  [DATALAB-2409]: made keycloak client arguments not required
     add bef2edc  [DATALAB-2409]: fixed aws creds check
     add 09c462b  [DATALAB-2409]: fixed aws creds check
     add 1cd62c8  [DATALAB-2409]: added logger in azure and gcp base dockerfiles
     add cf29c76  [DATALAB-2409]: resolved conflicts
     add 527fe2c  [DATALAB-2409]: returned ldap arguments to deploy_datalab.py
     add 0b2c554  [DATALAB-2409]: added output to configure_keycloak
     add b5cf134  [DATALAB-2409]: added variable definition
     add 9559339  [DATALAB-2409]: removed prints from configure_keycloak.py
     add 048bca8  [DATALAB-2409]: removed keycloak client default values
     add aee7cc9  [DATALAB-2409]: moved azure_ssn_instance_size argument to optional as it has default value
     add 26ff7d1  [DATALAB-2409]: removed logging warnings
     add 1ed1271  [DATALAB-2409]: added list
     add 372b6da  [DATALAB-2409]: removed logging duplicate
     add 661fa35  [DATALAB-2409]: added etc list
     add 27fcef0  [DATALAB-2409]: added etc list
     add ebfbcac  [DATALAB-2409]: replaced yaml.load with yaml.safe_load
     add 43353f6  [DATALAB-2409]: some tensor fixes
     add 17e5c20  [DATALAB-2409]: fixed merge conflict
     add f21a66b  [DATALAB-2409]: made gcp ssn instance size argument optional
     add cec814e  [DATALAB-2409]: added requests import
     add d6fb2d0  [DATALAB-2409]: fixed variable name
     add 299ec59  [DATALAB-2409]: added restart to tensorboard service
     add d5634c0  Revert "[DATALAB-2409]: replaced print with logging in all general/scripts/os .py scripts"
     new 50c664d  Merge pull request #1304 from apache/DATALAB-2409

The 1 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_datalab.py                      |  426 +++--
 .../src/base/scripts/configure_keycloak.py         |    5 +-
 .../src/base/scripts/install_prerequisites.py      |   24 +-
 .../src/dataengine/scripts/configure_dataengine.py |    3 +-
 .../scripts/configure_deep_learning_node.py        |    1 -
 .../src/edge/scripts/configure_http_proxy.py       |    3 +-
 .../src/general/conf/datalab.ini                   |   29 +-
 .../src/general/files/aws/base_Dockerfile          |    4 +-
 .../src/general/files/azure/base_Dockerfile        |    4 +-
 .../src/general/files/azure/tensor_Dockerfile      |    1 -
 .../src/general/files/gcp/base_Dockerfile          |    4 +-
 .../src/general/files/os/debian/sources.list       |   56 -
 .../src/general/files/os/redhat/sources.list       |   83 -
 .../src/general/lib/aws/actions_lib.py             |    1 +
 .../src/general/lib/aws/meta_lib.py                |   41 +-
 .../src/general/lib/os/debian/common_lib.py        |  163 +-
 .../src/general/lib/os/debian/edge_lib.py          |   67 +-
 .../src/general/lib/os/debian/notebook_lib.py      |   10 +-
 .../src/general/lib/os/fab.py                      | 1647 +++++++++++---------
 .../variales.tf => src/general/lib/os/logger.py}   |   56 +-
 .../src/general/lib/os/redhat/common_lib.py        |   33 -
 .../src/general/lib/os/redhat/edge_lib.py          |   31 -
 .../src/general/lib/os/redhat/notebook_lib.py      |    7 +-
 .../src/general/scripts/aws/common_collect_data.py |    5 +-
 .../general/scripts/aws/common_create_bucket.py    |    9 +-
 .../general/scripts/aws/common_create_instance.py  |   13 +-
 .../scripts/aws/common_create_notebook_image.py    |    3 +-
 .../general/scripts/aws/common_create_policy.py    |   13 +-
 .../scripts/aws/common_create_role_policy.py       |   15 +-
 .../scripts/aws/common_create_security_group.py    |   18 +-
 .../general/scripts/aws/common_create_subnet.py    |   31 +-
 .../scripts/aws/common_download_git_certfile.py    |    5 +-
 ...common_notebook_configure_dataengine-service.py |   18 +-
 .../aws/common_notebook_configure_dataengine.py    |    8 +-
 .../general/scripts/aws/common_prepare_notebook.py |   14 +-
 .../scripts/aws/common_remove_remote_kernels.py    |    3 +-
 .../src/general/scripts/aws/common_reupload_key.py |    3 +-
 .../general/scripts/aws/common_start_notebook.py   |   16 +-
 .../general/scripts/aws/common_stop_notebook.py    |   30 +-
 .../scripts/aws/common_terminate_notebook.py       |   25 +-
 .../scripts/aws/dataengine-service_configure.py    |   32 +-
 .../scripts/aws/dataengine-service_create.py       |   40 +-
 .../scripts/aws/dataengine-service_install_libs.py |    7 +-
 .../scripts/aws/dataengine-service_list_libs.py    |    5 +-
 .../scripts/aws/dataengine-service_prepare.py      |    9 +-
 .../scripts/aws/dataengine-service_terminate.py    |   16 +-
 .../general/scripts/aws/dataengine_configure.py    |   49 +-
 .../src/general/scripts/aws/dataengine_prepare.py  |   17 +-
 .../src/general/scripts/aws/dataengine_start.py    |   13 +-
 .../src/general/scripts/aws/dataengine_stop.py     |   18 +-
 .../general/scripts/aws/dataengine_terminate.py    |   11 +-
 .../general/scripts/aws/deeplearning_configure.py  |   59 +-
 .../scripts/aws/edge_associate_elastic_ip.py       |   13 +-
 .../src/general/scripts/aws/edge_configure.py      |   58 +-
 .../src/general/scripts/aws/edge_start.py          |   26 +-
 .../src/general/scripts/aws/edge_status.py         |   12 +-
 .../src/general/scripts/aws/edge_stop.py           |   14 +-
 .../src/general/scripts/aws/jupyter_configure.py   |   70 +-
 .../jupyter_dataengine-service_create_configs.py   |    1 +
 .../jupyter_install_dataengine-service_kernels.py  |    7 +-
 .../general/scripts/aws/jupyterlab_configure.py    |   62 +-
 .../src/general/scripts/aws/odahu_deploy.py        |   19 +-
 .../src/general/scripts/aws/odahu_prepare.py       |   26 +-
 .../src/general/scripts/aws/project_prepare.py     |   48 +-
 .../src/general/scripts/aws/project_terminate.py   |   36 +-
 .../src/general/scripts/aws/rstudio_configure.py   |   63 +-
 .../rstudio_dataengine-service_create_configs.py   |    5 +-
 .../scripts/aws/ssn_associate_elastic_ip.py        |   12 +-
 .../src/general/scripts/aws/ssn_configure.py       |  366 ++---
 .../src/general/scripts/aws/ssn_create_endpoint.py |   19 +-
 .../src/general/scripts/aws/ssn_create_vpc.py      |    9 +-
 .../src/general/scripts/aws/ssn_prepare.py         |  431 ++---
 .../src/general/scripts/aws/ssn_terminate.py       |   19 +-
 .../scripts/aws/ssn_terminate_aws_resources.py     |   54 +-
 .../scripts/aws/tensor-rstudio_configure.py        |   69 +-
 .../src/general/scripts/aws/tensor_configure.py    |   59 +-
 .../src/general/scripts/aws/zeppelin_configure.py  |   65 +-
 .../general/scripts/azure/common_collect_data.py   |    3 +-
 .../azure/common_create_datalake_directory.py      |    9 +-
 .../scripts/azure/common_create_instance.py        |   15 +-
 .../scripts/azure/common_create_notebook_image.py  |    7 +-
 .../scripts/azure/common_create_security_group.py  |    9 +-
 .../scripts/azure/common_create_storage_account.py |   13 +-
 .../general/scripts/azure/common_create_subnet.py  |    9 +-
 .../scripts/azure/common_download_git_certfile.py  |    5 +-
 .../azure/common_notebook_configure_dataengine.py  |   15 +-
 .../scripts/azure/common_prepare_notebook.py       |   28 +-
 .../scripts/azure/common_remove_remote_kernels.py  |    5 +-
 .../general/scripts/azure/common_reupload_key.py   |    3 +-
 .../general/scripts/azure/common_start_notebook.py |   26 +-
 .../general/scripts/azure/common_stop_notebook.py  |   22 +-
 .../scripts/azure/common_terminate_notebook.py     |   21 +-
 .../general/scripts/azure/dataengine_configure.py  |   49 +-
 .../general/scripts/azure/dataengine_prepare.py    |   23 +-
 .../src/general/scripts/azure/dataengine_start.py  |   18 +-
 .../src/general/scripts/azure/dataengine_stop.py   |   17 +-
 .../general/scripts/azure/dataengine_terminate.py  |   19 +-
 .../scripts/azure/deeplearning_configure.py        |   52 +-
 .../src/general/scripts/azure/edge_configure.py    |   45 +-
 .../src/general/scripts/azure/edge_prepare.py      |   56 +-
 .../src/general/scripts/azure/edge_start.py        |   23 +-
 .../src/general/scripts/azure/edge_status.py       |   11 +-
 .../src/general/scripts/azure/edge_stop.py         |   14 +-
 .../src/general/scripts/azure/edge_terminate.py    |   46 +-
 .../src/general/scripts/azure/jupyter_configure.py |   49 +-
 .../general/scripts/azure/jupyterlab_configure.py  |   48 +-
 .../src/general/scripts/azure/project_prepare.py   |   46 +-
 .../src/general/scripts/azure/project_terminate.py |   54 +-
 .../general/scripts/azure/rstudio_change_pass.py   |    7 +-
 .../src/general/scripts/azure/rstudio_configure.py |   50 +-
 .../src/general/scripts/azure/ssn_configure.py     |   61 +-
 .../general/scripts/azure/ssn_create_datalake.py   |    9 +-
 .../general/scripts/azure/ssn_create_peering.py    |    5 +-
 .../scripts/azure/ssn_create_resource_group.py     |    7 +-
 .../src/general/scripts/azure/ssn_create_vpc.py    |    7 +-
 .../src/general/scripts/azure/ssn_prepare.py       |   28 +-
 .../src/general/scripts/azure/ssn_terminate.py     |   64 +-
 .../src/general/scripts/azure/tensor_configure.py  |   47 +-
 .../general/scripts/azure/zeppelin_configure.py    |   47 +-
 .../src/general/scripts/gcp/common_collect_data.py |    5 +-
 .../general/scripts/gcp/common_create_bucket.py    |    5 +-
 .../general/scripts/gcp/common_create_firewall.py  |    9 +-
 .../general/scripts/gcp/common_create_instance.py  |    5 +-
 .../general/scripts/gcp/common_create_nat_route.py |    5 +-
 .../scripts/gcp/common_create_notebook_image.py    |    9 +-
 .../scripts/gcp/common_create_service_account.py   |   15 +-
 .../general/scripts/gcp/common_create_subnet.py    |    9 +-
 .../scripts/gcp/common_download_git_certfile.py    |    5 +-
 .../src/general/scripts/gcp/common_install_gpu.py  |    5 +-
 ...common_notebook_configure_dataengine-service.py |   20 +-
 .../gcp/common_notebook_configure_dataengine.py    |   15 +-
 .../general/scripts/gcp/common_prepare_notebook.py |   22 +-
 .../src/general/scripts/gcp/common_reupload_key.py |    3 +-
 .../general/scripts/gcp/common_start_notebook.py   |   22 +-
 .../general/scripts/gcp/common_stop_notebook.py    |   32 +-
 .../scripts/gcp/common_terminate_notebook.py       |   29 +-
 .../scripts/gcp/dataengine-service_configure.py    |   44 +-
 .../scripts/gcp/dataengine-service_create.py       |    5 +-
 .../scripts/gcp/dataengine-service_install_libs.py |   14 +-
 .../scripts/gcp/dataengine-service_list_libs.py    |   13 +-
 .../scripts/gcp/dataengine-service_prepare.py      |   15 +-
 .../scripts/gcp/dataengine-service_terminate.py    |   22 +-
 .../general/scripts/gcp/dataengine_configure.py    |   50 +-
 .../src/general/scripts/gcp/dataengine_prepare.py  |   21 +-
 .../src/general/scripts/gcp/dataengine_start.py    |   16 +-
 .../src/general/scripts/gcp/dataengine_stop.py     |   15 +-
 .../general/scripts/gcp/dataengine_terminate.py    |   17 +-
 .../general/scripts/gcp/deeplearning_configure.py  |   50 +-
 .../src/general/scripts/gcp/edge_configure.py      |   41 +-
 .../general/scripts/gcp/edge_create_static_ip.py   |   13 +-
 .../src/general/scripts/gcp/edge_start.py          |   23 +-
 .../src/general/scripts/gcp/edge_status.py         |   15 +-
 .../src/general/scripts/gcp/edge_stop.py           |   14 +-
 .../src/general/scripts/gcp/edge_terminate.py      |   32 +-
 .../src/general/scripts/gcp/jupyter_configure.py   |   52 +-
 .../general/scripts/gcp/jupyterlab_configure.py    |   53 +-
 .../src/general/scripts/gcp/project_prepare.py     |   36 +-
 .../src/general/scripts/gcp/project_terminate.py   |   43 +-
 .../src/general/scripts/gcp/rstudio_configure.py   |   52 +-
 .../rstudio_dataengine-service_create_configs.py   |    5 +-
 .../src/general/scripts/gcp/ssn_configure.py       |   54 +-
 .../general/scripts/gcp/ssn_create_static_ip.py    |   12 +-
 .../src/general/scripts/gcp/ssn_create_vpc.py      |    7 +-
 .../src/general/scripts/gcp/ssn_finalize.py        |    3 +-
 .../src/general/scripts/gcp/ssn_prepare.py         |   22 +-
 .../src/general/scripts/gcp/ssn_terminate.py       |   16 +-
 .../scripts/gcp/ssn_terminate_gcp_resources.py     |   45 +-
 .../src/general/scripts/gcp/superset_configure.py  |   52 +-
 .../scripts/gcp/tensor-rstudio_configure.py        |   54 +-
 .../src/general/scripts/gcp/tensor_configure.py    |   48 +-
 .../src/general/scripts/gcp/zeppelin_configure.py  |   47 +-
 .../src/general/templates/os/tensorboard.service   |    2 +
 .../src/jupyter/scripts/configure_jupyter_node.py  |    3 +-
 .../scripts/configure_jupyterlab_node.py           |    1 -
 .../src/project/scripts/configure_http_proxy.py    |    3 +-
 .../src/project/scripts/configure_nftables.py      |    3 +-
 .../src/project/templates/squid.conf               |    6 +-
 .../src/rstudio/scripts/configure_rstudio_node.py  |    3 +-
 infrastructure-provisioning/src/ssn/fabfile.py     |    6 +-
 .../src/ssn/scripts/backup.py                      |    2 +-
 .../src/ssn/scripts/configure_docker.py            |   19 +-
 .../src/ssn/scripts/configure_mongo.py             |    7 +-
 .../src/ssn/scripts/configure_ssn_node.py          |   23 +-
 .../src/ssn/scripts/configure_ui.py                |    9 +-
 .../src/ssn/scripts/resource_status.py             |    2 +-
 .../src/ssn/scripts/restore.py                     |    2 +-
 .../scripts/configure_tensor-rstudio_node.py       |    3 +-
 .../zeppelin/scripts/configure_zeppelin_node.py    |    3 +-
 .../bin/deploy/mongo_files/configure_mongo.py      |    4 +-
 189 files changed, 2998 insertions(+), 4198 deletions(-)
 delete mode 100644 infrastructure-provisioning/src/general/files/os/debian/sources.list
 delete mode 100644 infrastructure-provisioning/src/general/files/os/redhat/sources.list
 copy infrastructure-provisioning/{terraform/aws/project/main/variales.tf => src/general/lib/os/logger.py} (62%)

---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org


[incubator-datalab] 01/01: Merge pull request #1304 from apache/DATALAB-2409

Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.

lfrolov pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git

commit 50c664d61fe52a27aadbe61bf5cbb1d26eb0f279
Merge: 67b88af d5634c0
Author: Leonid Frolov <51...@users.noreply.github.com>
AuthorDate: Tue Oct 19 15:12:40 2021 +0300

    Merge pull request #1304 from apache/DATALAB-2409
    
    [DATALAB-2409]: Main functions review and refactoring

 .../scripts/deploy_datalab.py                      |  426 +++--
 .../src/base/scripts/configure_keycloak.py         |    5 +-
 .../src/base/scripts/install_prerequisites.py      |   24 +-
 .../src/dataengine/scripts/configure_dataengine.py |    3 +-
 .../scripts/configure_deep_learning_node.py        |    1 -
 .../src/edge/scripts/configure_http_proxy.py       |    3 +-
 .../src/general/conf/datalab.ini                   |   29 +-
 .../src/general/files/aws/base_Dockerfile          |    4 +-
 .../src/general/files/azure/base_Dockerfile        |    4 +-
 .../src/general/files/azure/tensor_Dockerfile      |    1 -
 .../src/general/files/gcp/base_Dockerfile          |    4 +-
 .../src/general/files/os/debian/sources.list       |   56 -
 .../src/general/files/os/redhat/sources.list       |   83 -
 .../src/general/lib/aws/actions_lib.py             |    1 +
 .../src/general/lib/aws/meta_lib.py                |   41 +-
 .../src/general/lib/os/debian/common_lib.py        |  163 +-
 .../src/general/lib/os/debian/edge_lib.py          |   67 +-
 .../src/general/lib/os/debian/notebook_lib.py      |   10 +-
 .../src/general/lib/os/fab.py                      | 1647 +++++++++++---------
 .../os/tensorboard.service => lib/os/logger.py}    |   25 +-
 .../src/general/lib/os/redhat/common_lib.py        |   33 -
 .../src/general/lib/os/redhat/edge_lib.py          |   31 -
 .../src/general/lib/os/redhat/notebook_lib.py      |    7 +-
 .../src/general/scripts/aws/common_collect_data.py |    5 +-
 .../general/scripts/aws/common_create_bucket.py    |    9 +-
 .../general/scripts/aws/common_create_instance.py  |   13 +-
 .../scripts/aws/common_create_notebook_image.py    |    3 +-
 .../general/scripts/aws/common_create_policy.py    |   13 +-
 .../scripts/aws/common_create_role_policy.py       |   15 +-
 .../scripts/aws/common_create_security_group.py    |   18 +-
 .../general/scripts/aws/common_create_subnet.py    |   31 +-
 .../scripts/aws/common_download_git_certfile.py    |    5 +-
 ...common_notebook_configure_dataengine-service.py |   18 +-
 .../aws/common_notebook_configure_dataengine.py    |    8 +-
 .../general/scripts/aws/common_prepare_notebook.py |   14 +-
 .../scripts/aws/common_remove_remote_kernels.py    |    3 +-
 .../src/general/scripts/aws/common_reupload_key.py |    3 +-
 .../general/scripts/aws/common_start_notebook.py   |   16 +-
 .../general/scripts/aws/common_stop_notebook.py    |   30 +-
 .../scripts/aws/common_terminate_notebook.py       |   25 +-
 .../scripts/aws/dataengine-service_configure.py    |   32 +-
 .../scripts/aws/dataengine-service_create.py       |   40 +-
 .../scripts/aws/dataengine-service_install_libs.py |    7 +-
 .../scripts/aws/dataengine-service_list_libs.py    |    5 +-
 .../scripts/aws/dataengine-service_prepare.py      |    9 +-
 .../scripts/aws/dataengine-service_terminate.py    |   16 +-
 .../general/scripts/aws/dataengine_configure.py    |   49 +-
 .../src/general/scripts/aws/dataengine_prepare.py  |   17 +-
 .../src/general/scripts/aws/dataengine_start.py    |   13 +-
 .../src/general/scripts/aws/dataengine_stop.py     |   18 +-
 .../general/scripts/aws/dataengine_terminate.py    |   11 +-
 .../general/scripts/aws/deeplearning_configure.py  |   59 +-
 .../scripts/aws/edge_associate_elastic_ip.py       |   13 +-
 .../src/general/scripts/aws/edge_configure.py      |   58 +-
 .../src/general/scripts/aws/edge_start.py          |   26 +-
 .../src/general/scripts/aws/edge_status.py         |   12 +-
 .../src/general/scripts/aws/edge_stop.py           |   14 +-
 .../src/general/scripts/aws/jupyter_configure.py   |   70 +-
 .../jupyter_dataengine-service_create_configs.py   |    1 +
 .../jupyter_install_dataengine-service_kernels.py  |    7 +-
 .../general/scripts/aws/jupyterlab_configure.py    |   62 +-
 .../src/general/scripts/aws/odahu_deploy.py        |   19 +-
 .../src/general/scripts/aws/odahu_prepare.py       |   26 +-
 .../src/general/scripts/aws/project_prepare.py     |   48 +-
 .../src/general/scripts/aws/project_terminate.py   |   36 +-
 .../src/general/scripts/aws/rstudio_configure.py   |   63 +-
 .../rstudio_dataengine-service_create_configs.py   |    5 +-
 .../scripts/aws/ssn_associate_elastic_ip.py        |   12 +-
 .../src/general/scripts/aws/ssn_configure.py       |  366 ++---
 .../src/general/scripts/aws/ssn_create_endpoint.py |   19 +-
 .../src/general/scripts/aws/ssn_create_vpc.py      |    9 +-
 .../src/general/scripts/aws/ssn_prepare.py         |  431 ++---
 .../src/general/scripts/aws/ssn_terminate.py       |   19 +-
 .../scripts/aws/ssn_terminate_aws_resources.py     |   54 +-
 .../scripts/aws/tensor-rstudio_configure.py        |   69 +-
 .../src/general/scripts/aws/tensor_configure.py    |   59 +-
 .../src/general/scripts/aws/zeppelin_configure.py  |   65 +-
 .../general/scripts/azure/common_collect_data.py   |    3 +-
 .../azure/common_create_datalake_directory.py      |    9 +-
 .../scripts/azure/common_create_instance.py        |   15 +-
 .../scripts/azure/common_create_notebook_image.py  |    7 +-
 .../scripts/azure/common_create_security_group.py  |    9 +-
 .../scripts/azure/common_create_storage_account.py |   13 +-
 .../general/scripts/azure/common_create_subnet.py  |    9 +-
 .../scripts/azure/common_download_git_certfile.py  |    5 +-
 .../azure/common_notebook_configure_dataengine.py  |   15 +-
 .../scripts/azure/common_prepare_notebook.py       |   28 +-
 .../scripts/azure/common_remove_remote_kernels.py  |    5 +-
 .../general/scripts/azure/common_reupload_key.py   |    3 +-
 .../general/scripts/azure/common_start_notebook.py |   26 +-
 .../general/scripts/azure/common_stop_notebook.py  |   22 +-
 .../scripts/azure/common_terminate_notebook.py     |   21 +-
 .../general/scripts/azure/dataengine_configure.py  |   49 +-
 .../general/scripts/azure/dataengine_prepare.py    |   23 +-
 .../src/general/scripts/azure/dataengine_start.py  |   18 +-
 .../src/general/scripts/azure/dataengine_stop.py   |   17 +-
 .../general/scripts/azure/dataengine_terminate.py  |   19 +-
 .../scripts/azure/deeplearning_configure.py        |   52 +-
 .../src/general/scripts/azure/edge_configure.py    |   45 +-
 .../src/general/scripts/azure/edge_prepare.py      |   56 +-
 .../src/general/scripts/azure/edge_start.py        |   23 +-
 .../src/general/scripts/azure/edge_status.py       |   11 +-
 .../src/general/scripts/azure/edge_stop.py         |   14 +-
 .../src/general/scripts/azure/edge_terminate.py    |   46 +-
 .../src/general/scripts/azure/jupyter_configure.py |   49 +-
 .../general/scripts/azure/jupyterlab_configure.py  |   48 +-
 .../src/general/scripts/azure/project_prepare.py   |   46 +-
 .../src/general/scripts/azure/project_terminate.py |   54 +-
 .../general/scripts/azure/rstudio_change_pass.py   |    7 +-
 .../src/general/scripts/azure/rstudio_configure.py |   50 +-
 .../src/general/scripts/azure/ssn_configure.py     |   61 +-
 .../general/scripts/azure/ssn_create_datalake.py   |    9 +-
 .../general/scripts/azure/ssn_create_peering.py    |    5 +-
 .../scripts/azure/ssn_create_resource_group.py     |    7 +-
 .../src/general/scripts/azure/ssn_create_vpc.py    |    7 +-
 .../src/general/scripts/azure/ssn_prepare.py       |   28 +-
 .../src/general/scripts/azure/ssn_terminate.py     |   64 +-
 .../src/general/scripts/azure/tensor_configure.py  |   47 +-
 .../general/scripts/azure/zeppelin_configure.py    |   47 +-
 .../src/general/scripts/gcp/common_collect_data.py |    5 +-
 .../general/scripts/gcp/common_create_bucket.py    |    5 +-
 .../general/scripts/gcp/common_create_firewall.py  |    9 +-
 .../general/scripts/gcp/common_create_instance.py  |    5 +-
 .../general/scripts/gcp/common_create_nat_route.py |    5 +-
 .../scripts/gcp/common_create_notebook_image.py    |    9 +-
 .../scripts/gcp/common_create_service_account.py   |   15 +-
 .../general/scripts/gcp/common_create_subnet.py    |    9 +-
 .../scripts/gcp/common_download_git_certfile.py    |    5 +-
 .../src/general/scripts/gcp/common_install_gpu.py  |    5 +-
 ...common_notebook_configure_dataengine-service.py |   20 +-
 .../gcp/common_notebook_configure_dataengine.py    |   15 +-
 .../general/scripts/gcp/common_prepare_notebook.py |   22 +-
 .../src/general/scripts/gcp/common_reupload_key.py |    3 +-
 .../general/scripts/gcp/common_start_notebook.py   |   22 +-
 .../general/scripts/gcp/common_stop_notebook.py    |   32 +-
 .../scripts/gcp/common_terminate_notebook.py       |   29 +-
 .../scripts/gcp/dataengine-service_configure.py    |   44 +-
 .../scripts/gcp/dataengine-service_create.py       |    5 +-
 .../scripts/gcp/dataengine-service_install_libs.py |   14 +-
 .../scripts/gcp/dataengine-service_list_libs.py    |   13 +-
 .../scripts/gcp/dataengine-service_prepare.py      |   15 +-
 .../scripts/gcp/dataengine-service_terminate.py    |   22 +-
 .../general/scripts/gcp/dataengine_configure.py    |   50 +-
 .../src/general/scripts/gcp/dataengine_prepare.py  |   21 +-
 .../src/general/scripts/gcp/dataengine_start.py    |   16 +-
 .../src/general/scripts/gcp/dataengine_stop.py     |   15 +-
 .../general/scripts/gcp/dataengine_terminate.py    |   17 +-
 .../general/scripts/gcp/deeplearning_configure.py  |   50 +-
 .../src/general/scripts/gcp/edge_configure.py      |   41 +-
 .../general/scripts/gcp/edge_create_static_ip.py   |   13 +-
 .../src/general/scripts/gcp/edge_start.py          |   23 +-
 .../src/general/scripts/gcp/edge_status.py         |   15 +-
 .../src/general/scripts/gcp/edge_stop.py           |   14 +-
 .../src/general/scripts/gcp/edge_terminate.py      |   32 +-
 .../src/general/scripts/gcp/jupyter_configure.py   |   52 +-
 .../general/scripts/gcp/jupyterlab_configure.py    |   53 +-
 .../src/general/scripts/gcp/project_prepare.py     |   36 +-
 .../src/general/scripts/gcp/project_terminate.py   |   43 +-
 .../src/general/scripts/gcp/rstudio_configure.py   |   52 +-
 .../rstudio_dataengine-service_create_configs.py   |    5 +-
 .../src/general/scripts/gcp/ssn_configure.py       |   54 +-
 .../general/scripts/gcp/ssn_create_static_ip.py    |   12 +-
 .../src/general/scripts/gcp/ssn_create_vpc.py      |    7 +-
 .../src/general/scripts/gcp/ssn_finalize.py        |    3 +-
 .../src/general/scripts/gcp/ssn_prepare.py         |   22 +-
 .../src/general/scripts/gcp/ssn_terminate.py       |   16 +-
 .../scripts/gcp/ssn_terminate_gcp_resources.py     |   45 +-
 .../src/general/scripts/gcp/superset_configure.py  |   52 +-
 .../scripts/gcp/tensor-rstudio_configure.py        |   54 +-
 .../src/general/scripts/gcp/tensor_configure.py    |   48 +-
 .../src/general/scripts/gcp/zeppelin_configure.py  |   47 +-
 .../src/general/templates/os/tensorboard.service   |    2 +
 .../src/jupyter/scripts/configure_jupyter_node.py  |    3 +-
 .../scripts/configure_jupyterlab_node.py           |    1 -
 .../src/project/scripts/configure_http_proxy.py    |    3 +-
 .../src/project/scripts/configure_nftables.py      |    3 +-
 .../src/project/templates/squid.conf               |    6 +-
 .../src/rstudio/scripts/configure_rstudio_node.py  |    3 +-
 infrastructure-provisioning/src/ssn/fabfile.py     |    6 +-
 .../src/ssn/scripts/backup.py                      |    2 +-
 .../src/ssn/scripts/configure_docker.py            |   19 +-
 .../src/ssn/scripts/configure_mongo.py             |    7 +-
 .../src/ssn/scripts/configure_ssn_node.py          |   23 +-
 .../src/ssn/scripts/configure_ui.py                |    9 +-
 .../src/ssn/scripts/resource_status.py             |    2 +-
 .../src/ssn/scripts/restore.py                     |    2 +-
 .../scripts/configure_tensor-rstudio_node.py       |    3 +-
 .../zeppelin/scripts/configure_zeppelin_node.py    |    3 +-
 .../bin/deploy/mongo_files/configure_mongo.py      |    4 +-
 189 files changed, 2997 insertions(+), 4168 deletions(-)


---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org