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

omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git


The following commit(s) were added to refs/heads/DLAB-1546 by this push:
     new dcef057  [DLAB-1546]: added name convention changes
dcef057 is described below

commit dcef057123154cb5443d4d7648e1aae8774f8891
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Tue Feb 25 16:14:02 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/scripts/aws/common_download_git_certfile.py            | 2 +-
 .../scripts/aws/common_notebook_configure_dataengine-service.py        | 1 +
 .../src/general/scripts/aws/common_notebook_configure_dataengine.py    | 1 +
 .../src/general/scripts/aws/common_prepare_notebook.py                 | 1 +
 .../src/general/scripts/aws/common_start_notebook.py                   | 1 +
 .../src/general/scripts/aws/common_stop_notebook.py                    | 1 +
 .../src/general/scripts/aws/dataengine_start.py                        | 1 +
 .../src/general/scripts/aws/deeplearning_configure.py                  | 1 +
 infrastructure-provisioning/src/general/scripts/aws/edge_configure.py  | 1 +
 infrastructure-provisioning/src/general/scripts/aws/edge_start.py      | 1 +
 infrastructure-provisioning/src/general/scripts/aws/edge_status.py     | 1 +
 .../src/general/scripts/aws/jupyter_configure.py                       | 1 +
 .../src/general/scripts/aws/jupyterlab_configure.py                    | 1 +
 infrastructure-provisioning/src/general/scripts/aws/project_prepare.py | 3 ++-
 .../src/general/scripts/aws/rstudio_configure.py                       | 1 +
 .../src/general/scripts/aws/tensor-rstudio_configure.py                | 1 +
 .../src/general/scripts/aws/tensor_configure.py                        | 1 +
 .../src/general/scripts/aws/zeppelin_configure.py                      | 1 +
 18 files changed, 19 insertions(+), 2 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
index bd7d266..ba2e73d 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_download_git_certfile.py
@@ -43,7 +43,7 @@ if __name__ == "__main__":
     env.host_string = env.user + "@" + env.hosts
 
     service_base_name = os.environ['conf_service_base_name'] = 
replace_multi_symbols(
-        os.environ['conf_service_base_name'].lower()[:12], '-', True)
+        os.environ['conf_service_base_name'].lower()[:20], '-', True)
     project_name = os.environ['project_name']
     endpoint_name = os.environ['endpoint_name']
     bucket_name = ('{0}-{1}-{2}-bucket'.format(service_base_name,
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
index a39a71c..ffac740 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine-service.py
@@ -30,6 +30,7 @@ import dlab.meta_lib
 import traceback
 import os
 import uuid
+from fabric.api import *
 
 
 def clear_resources():
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
index b8b69ed..abe929d 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_notebook_configure_dataengine.py
@@ -30,6 +30,7 @@ import dlab.meta_lib
 import traceback
 import os
 import uuid
+from fabric.api import *
 
 
 def clear_resources():
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
 
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
index 69676ce..0299b2c 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -30,6 +30,7 @@ import traceback
 import dlab.fab
 import dlab.actions_lib
 import dlab.meta_lib
+from fabric.api import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--uuid', type=str, default='')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py 
b/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py
index 91d4f28..dbf5093 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_start_notebook.py
@@ -31,6 +31,7 @@ import traceback
 import os
 import uuid
 import argparse
+from fabric.api import *
 
 
 if __name__ == "__main__":
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py 
b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
index 930488b..ddcf4a1 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/common_stop_notebook.py
@@ -27,6 +27,7 @@ import sys
 import dlab.fab
 import dlab.actions_lib
 import dlab.meta_lib
+from fabric.api import *
 import traceback
 import os
 import uuid
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py 
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
index 6f9e109..8040850 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_start.py
@@ -29,6 +29,7 @@ import dlab.actions_lib
 import dlab.meta_lib
 import sys
 import traceback
+from fabric.api import *
 
 
 def start_data_engine(cluster_name):
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
index df007dc..9c0428c 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
@@ -30,6 +30,7 @@ import dlab.actions_lib
 import dlab.meta_lib
 import os
 import argparse
+from fabric.api import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--uuid', type=str, default='')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
index 5752c62..dbebb1f 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_configure.py
@@ -31,6 +31,7 @@ import dlab.meta_lib
 import logging
 import traceback
 import uuid
+from fabric.api import *
 
 
 if __name__ == "__main__":
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_start.py 
b/infrastructure-provisioning/src/general/scripts/aws/edge_start.py
index dcfc853..66f6bb6 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_start.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_start.py
@@ -30,6 +30,7 @@ import os
 import json
 
 
+
 if __name__ == "__main__":
     local_log_filename = "{}_{}_{}.log".format(os.environ['conf_resource'], 
os.environ['project_name'],
                                                os.environ['request_id'])
diff --git a/infrastructure-provisioning/src/general/scripts/aws/edge_status.py 
b/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
index 1ef2489..d8bd92e 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/edge_status.py
@@ -31,6 +31,7 @@ import time
 import os
 import logging
 import traceback
+from fabric.api import *
 
 
 if __name__ == "__main__":
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
index 56f2965..d596958 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
@@ -30,6 +30,7 @@ import dlab.actions_lib
 import dlab.meta_lib
 import os
 import argparse
+from fabric.api import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--uuid', type=str, default='')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
index 33d6083..9842aea 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
@@ -30,6 +30,7 @@ import dlab.actions_lib
 import dlab.meta_lib
 import os
 import argparse
+from fabric.api import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--uuid', type=str, default='')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py 
b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index 271a2e3..5b18969 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -31,6 +31,7 @@ import os
 import traceback
 import boto3
 import logging
+from fabric.api import *
 
 
 if __name__ == "__main__":
@@ -42,7 +43,7 @@ if __name__ == "__main__":
                         filename=local_log_filepath)
 
     try:
-        create_aws_config_files()
+        dlab.actions_lib.create_aws_config_files()
         print('Generating infrastructure names and tags')
         project_conf = dict()
         project_conf['service_base_name'] = 
os.environ['conf_service_base_name'] = dlab.fab.replace_multi_symbols(
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
index 8c34bc1..68e5df8 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -30,6 +30,7 @@ import dlab.actions_lib
 import dlab.meta_lib
 import os
 import argparse
+from fabric.api import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--uuid', type=str, default='')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
 
b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
index 79eb96d..aac71b0 100644
--- 
a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
+++ 
b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
@@ -31,6 +31,7 @@ import dlab.meta_lib
 import os
 import argparse
 import traceback
+from fabric.api import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--uuid', type=str, default='')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
index 7c71af3..6335618 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
@@ -31,6 +31,7 @@ import dlab.meta_lib
 import os
 import argparse
 import traceback
+from fabric.api import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--uuid', type=str, default='')
diff --git 
a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py 
b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
index 3126a58..dd022bd 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
@@ -31,6 +31,7 @@ import dlab.meta_lib
 import os
 import argparse
 import traceback
+from fabric.api import *
 
 parser = argparse.ArgumentParser()
 parser.add_argument('--uuid', type=str, default='')


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to