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/04 09:37:06 UTC
[incubator-datalab] branch DATALAB-2091-dev-fab-classic created
(now aab0a7a)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DATALAB-2091-dev-fab-classic
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git.
at aab0a7a [DATALAB-2091]: replaced fabric with fab-classic
This branch includes the following new commits:
new aab0a7a [DATALAB-2091]: replaced fabric with fab-classic
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.
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org
[incubator-datalab] 01/01: [DATALAB-2091]: replaced fabric with
fab-classic
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-dev-fab-classic
in repository https://gitbox.apache.org/repos/asf/incubator-datalab.git
commit aab0a7af723ba2c3b49eff3ac02c36d8ad60b060
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 4 11:36:44 2021 +0200
[DATALAB-2091]: replaced fabric with fab-classic
---
README.md | 4 ++--
.../scripts/deploy_repository/deploy_repository.py | 2 +-
.../scripts/deploy_repository/files/Dockerfile | 2 +-
infrastructure-provisioning/src/base/scripts/install_prerequisites.py | 2 +-
infrastructure-provisioning/src/general/files/aws/base_Dockerfile | 2 +-
infrastructure-provisioning/src/general/files/azure/base_Dockerfile | 2 +-
infrastructure-provisioning/src/general/files/gcp/base_Dockerfile | 2 +-
infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py | 2 +-
.../src/general/scripts/azure/ssn_configure.py | 2 +-
infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py | 2 +-
10 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/README.md b/README.md
index 33721fb..4e37065 100644
--- a/README.md
+++ b/README.md
@@ -271,7 +271,7 @@ To build Keycloak node, following steps should be executed:
sudo su
apt-get update
apt-get install -y python-pip
-pip install fabric==1.14.0
+pip install fab-classic
```
- Go to *datalab* directory
- Run *infrastructure-provisioning/scripts/deploy_keycloak/deploy_keycloak.py* deployment script:
@@ -498,7 +498,7 @@ apt-cache policy docker-ce
apt-get install -y docker-ce=17.06.2~ce-0~ubuntu
usermod -a -G docker *username*
apt-get install -y python-pip
-pip install fabric==1.14.0
+pip install fab-classic
cd incubator-datalab
```
- Go to *datalab* directory
diff --git a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
index 0d05532..705a156 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
+++ b/infrastructure-provisioning/scripts/deploy_repository/deploy_repository.py
@@ -855,7 +855,7 @@ def install_nexus():
mount_efs()
sudo('apt-get install -y maven nmap python-pip')
sudo('pip2 install -UI pip')
- sudo('pip2 install -U fabric==1.14.0')
+ sudo('pip2 install -U fab-classic')
sudo('mkdir -p /opt/nexus')
sudo('wget https://sonatype-download.global.ssl.fastly.net/nexus/{0}/nexus-{1}-unix.tar.gz -O \
/opt/nexus-{1}-unix.tar.gz'.format(
diff --git a/infrastructure-provisioning/scripts/deploy_repository/files/Dockerfile b/infrastructure-provisioning/scripts/deploy_repository/files/Dockerfile
index af2c039..a89e819 100644
--- a/infrastructure-provisioning/scripts/deploy_repository/files/Dockerfile
+++ b/infrastructure-provisioning/scripts/deploy_repository/files/Dockerfile
@@ -29,4 +29,4 @@ RUN apt-get update && \
# Install any python dependencies
RUN pip install -UI pip==9.0.3
-RUN pip install boto3 backoff fabric==1.14.0 fabvenv awscli argparse ujson jupyter pycrypto
\ No newline at end of file
+RUN pip install boto3 backoff fab-classic fabvenv awscli argparse ujson jupyter pycrypto
\ No newline at end of file
diff --git a/infrastructure-provisioning/src/base/scripts/install_prerequisites.py b/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
index 5c95894..b78a651 100644
--- a/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
+++ b/infrastructure-provisioning/src/base/scripts/install_prerequisites.py
@@ -33,7 +33,7 @@ parser = argparse.ArgumentParser()
parser.add_argument('--hostname', type=str, default='')
parser.add_argument('--keyfile', type=str, default='')
parser.add_argument('--pip_packages', type=str,
- default='boto3 argparse fabric==1.14.0 awscli google-api-python-client google-auth-httplib2 google-cloud-storage pycrypto azure==2.0.0')
+ default='boto3 argparse fab-classic awscli google-api-python-client google-auth-httplib2 google-cloud-storage pycrypto azure==2.0.0')
parser.add_argument('--additional_config', type=str, default='{"empty":"string"}')
parser.add_argument('--user', type=str, default='')
parser.add_argument('--edge_private_ip', type=str, default='')
diff --git a/infrastructure-provisioning/src/general/files/aws/base_Dockerfile b/infrastructure-provisioning/src/general/files/aws/base_Dockerfile
index fa83551..0c82f45 100644
--- a/infrastructure-provisioning/src/general/files/aws/base_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/aws/base_Dockerfile
@@ -31,7 +31,7 @@ RUN apt-get update && \
# Install any python dependencies
RUN pip install -UI qtconsole==4.7.7 pip==20.1 && \
- pip install boto3 backoff fabric==1.14.0 fabvenv awscli argparse requests ujson jupyter pycrypto
+ pip install boto3 backoff fab-classic fabvenv awscli argparse requests ujson jupyter pycrypto
# Configuring ssh for user
RUN mkdir -p /root/.ssh; echo "Host *" > /root/.ssh/config; \
diff --git a/infrastructure-provisioning/src/general/files/azure/base_Dockerfile b/infrastructure-provisioning/src/general/files/azure/base_Dockerfile
index b3a4d26..1d18a39 100644
--- a/infrastructure-provisioning/src/general/files/azure/base_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/azure/base_Dockerfile
@@ -31,7 +31,7 @@ RUN apt-get update && \
# Install any python dependencies
RUN pip install -UI qtconsole==4.7.7 pip==20.1 && \
- pip install backoff fabric==1.14.0 fabvenv argparse requests ujson jupyter pycrypto azure==2.0.0 azure-mgmt-authorization pyyaml
+ pip install backoff fab-classic fabvenv argparse requests ujson jupyter pycrypto azure==2.0.0 azure-mgmt-authorization pyyaml
# Configuring ssh for user
RUN mkdir -p /root/.ssh; echo "Host *" > /root/.ssh/config; \
diff --git a/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile b/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
index 0590753..f358a6e 100644
--- a/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
@@ -31,7 +31,7 @@ RUN apt-get update && \
# Install any python dependencies
RUN pip install -UI qtconsole==4.7.7 pip==20.1 && \
- pip install boto3 backoff fabric==1.14.0 fabvenv argparse ujson jupyter pycrypto google-api-python-client google-cloud-storage \
+ pip install boto3 backoff fab-classic fabvenv argparse ujson jupyter pycrypto google-api-python-client google-cloud-storage \
pyyaml google-auth-httplib2 oauth2client
# Configuring ssh for user
diff --git a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index 64e41a4..3fcb444 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -198,7 +198,7 @@ if __name__ == "__main__":
try:
logging.info('[INSTALLING PREREQUISITES TO SSN INSTANCE]')
print('[INSTALLING PREREQUISITES TO SSN INSTANCE]')
- params = "--hostname {} --keyfile {} --pip_packages 'boto3 bcrypt==3.1.7 backoff argparse fabric==1.14.0 awscli pymongo " \
+ params = "--hostname {} --keyfile {} --pip_packages 'boto3 bcrypt==3.1.7 backoff argparse fab-classic awscli pymongo " \
"pyyaml jinja2' --user {} --region {}". \
format(ssn_conf['instance_hostname'], os.environ['conf_key_dir'] + os.environ['conf_key_name'] + ".pem",
ssn_conf['datalab_ssh_user'], os.environ['aws_region'])
diff --git a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 5142136..15cd1a6 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -148,7 +148,7 @@ if __name__ == "__main__":
try:
logging.info('[INSTALLING PREREQUISITES TO SSN INSTANCE]')
print('[INSTALLING PREREQUISITES TO SSN INSTANCE]')
- params = "--hostname {} --keyfile {} --pip_packages 'backoff bcrypt==3.1.7 argparse fabric==1.14.0 pymongo pyyaml " \
+ params = "--hostname {} --keyfile {} --pip_packages 'backoff bcrypt==3.1.7 argparse fab-classic pymongo pyyaml " \
"pycrypto azure==2.0.0' --user {} --region {}".format(ssn_conf['instance_host'],
ssn_conf['ssh_key_path'],
ssn_conf['datalab_ssh_user'],
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 72d24ca..6650f3c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -159,7 +159,7 @@ if __name__ == "__main__":
logging.info('[INSTALLING PREREQUISITES TO SSN INSTANCE]')
print('[INSTALLING PREREQUISITES TO SSN INSTANCE]')
params = "--hostname {} --keyfile {} --pip_packages " \
- "'boto3 bcrypt==3.1.7 backoff argparse fabric==1.14.0 awscli pymongo pyyaml " \
+ "'boto3 bcrypt==3.1.7 backoff argparse fab-classic awscli pymongo pyyaml " \
"google-api-python-client google-cloud-storage pycrypto' --user {} --region {}". \
format(ssn_conf['instance_hostname'], ssn_conf['ssh_key_path'],
ssn_conf['datalab_ssh_user'], ssn_conf['region'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@datalab.apache.org
For additional commands, e-mail: commits-help@datalab.apache.org