This is an automated email from the ASF dual-hosted git repository. omartushevskyi pushed a commit to branch DLAB-1158 in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1158 by this push: new ebc25f1 fixed typo ebc25f1 is described below commit ebc25f16980cce23b5c453e0f81ae4af2b1d2706 Author: Oleh Martushevskyi <oleh_martushevs...@epam.com> AuthorDate: Mon Nov 4 21:03:58 2019 +0200 fixed typo --- .../scripts/aws/dataengine-service_configure.py | 6 +++--- .../src/general/scripts/aws/dataengine_configure.py | 5 +++-- .../src/general/scripts/aws/deeplearning_configure.py | 12 ++++++------ .../src/general/scripts/aws/jupyter_configure.py | 12 ++++++------ .../src/general/scripts/aws/rstudio_configure.py | 8 ++++---- .../general/scripts/aws/tensor-rstudio_configure.py | 18 ++++++++++-------- .../src/general/scripts/aws/tensor_configure.py | 18 ++++++++++-------- .../src/general/scripts/aws/zeppelin_configure.py | 8 ++++---- .../src/general/scripts/azure/dataengine_configure.py | 4 ++-- .../general/scripts/azure/deeplearning_configure.py | 12 ++++++------ .../src/general/scripts/azure/jupyter_configure.py | 8 ++++---- .../src/general/scripts/azure/rstudio_configure.py | 8 ++++---- .../src/general/scripts/azure/tensor_configure.py | 12 ++++++------ .../src/general/scripts/azure/zeppelin_configure.py | 8 ++++---- .../scripts/gcp/dataengine-service_configure.py | 4 ++-- .../src/general/scripts/gcp/dataengine_configure.py | 4 ++-- .../src/general/scripts/gcp/deeplearning_configure.py | 12 ++++++------ .../src/general/scripts/gcp/jupyter_configure.py | 8 ++++---- .../src/general/scripts/gcp/rstudio_configure.py | 8 ++++---- .../general/scripts/gcp/tensor-rstudio_configure.py | 12 ++++++------ .../src/general/scripts/gcp/tensor_configure.py | 12 ++++++------ .../src/general/scripts/gcp/zeppelin_configure.py | 8 ++++---- 22 files changed, 106 insertions(+), 101 deletions(-) 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 cb79b1a..c390c79 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine-service_configure.py @@ -252,9 +252,9 @@ if __name__ == "__main__": logging.info('[SUMMARY]') ip_address = emr_conf['cluster_master_instances'][0].get('PrivateIpAddress') emr_master_url = "http://" + ip_address + ":8088" - emr_master_acces_url = "http://" + emr_conf['edge_instance_ip'] + "/{}/".format(emr_conf['exploratory_name'] + - '_' + - emr_conf['computational_name']) + emr_master_acces_url = "https://" + emr_conf['edge_instance_ip'] + "/{}/".format(emr_conf['exploratory_name'] + + '_' + + emr_conf['computational_name']) logging.info('[SUMMARY]') print('[SUMMARY]') print("Service base name: {}".format(emr_conf['service_base_name'])) diff --git a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py index 20f58af..e2026fe 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_configure.py @@ -426,7 +426,8 @@ if __name__ == "__main__": ip_address = get_instance_ip_address(data_engine['tag_name'], data_engine['master_node_name']).get('Private') spark_master_url = "http://" + ip_address + ":8080" - spark_master_acces_url = "http://" + edge_instance_ip + "/{}/".format(data_engine['exploratory_name'] + '_' + data_engine['computational_name']) + spark_master_access_url = "https://" + edge_instance_ip + "/{}/".format(data_engine['exploratory_name'] + + '_' + data_engine['computational_name']) logging.info('[SUMMARY]') print('[SUMMARY]') print("Service base name: {}".format(data_engine['service_base_name'])) @@ -442,7 +443,7 @@ if __name__ == "__main__": "Action": "Create new Data Engine", "computational_url": [ {"description": "Apache Spark Master", - "url": spark_master_acces_url}, + "url": spark_master_access_url}, #{"description": "Apache Spark Master (via tunnel)", #"url": spark_master_url} ]} diff --git a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py index e257843..84836cd 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py @@ -301,9 +301,9 @@ if __name__ == "__main__": dns_name = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) tensor_board_url = 'http://' + ip_address + ':6006' jupyter_url = 'http://' + ip_address + ':8888/{}/'.format(notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) - tensorboard_acces_url = "http://" + edge_instance_ip + "/{}-tensor/".format(notebook_config['exploratory_name']) + jupyter_notebook_access_url = "https://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) + jupyter_ungit_access_url = "https://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) + tensorboard_access_url = "https://" + edge_instance_ip + "/{}-tensor/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -334,11 +334,11 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "TensorBoard", - "url": tensorboard_acces_url}, + "url": tensorboard_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_url}, #{"description": "TensorBoard (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py index 6b17dec..e03bb13 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py @@ -309,8 +309,8 @@ if __name__ == "__main__": dns_name = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) jupyter_ip_url = "http://" + ip_address + ":8888/{}/".format(notebook_config['exploratory_name']) jupyter_dns_url = "http://" + dns_name + ":8888/{}/".format(notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) + jupyter_notebook_access_url = "https://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) + jupyter_ungit_access_url = "https://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -327,8 +327,8 @@ if __name__ == "__main__": print("Jupyter URL: {}".format(jupyter_ip_url)) print("Jupyter URL: {}".format(jupyter_dns_url)) print("Ungit URL: {}".format(ungit_ip_url)) - print("ReverseProxyNotebook".format(jupyter_notebook_acces_url)) - print("ReverseProxyUngit".format(jupyter_ungit_acces_url)) + print("ReverseProxyNotebook".format(jupyter_notebook_access_url)) + print("ReverseProxyUngit".format(jupyter_ungit_access_url)) print('SSH access (from Edge node, via IP address): ssh -i {0}.pem {1}@{2}'. format(notebook_config['key_name'], notebook_config['dlab_ssh_user'], ip_address)) print('SSH access (from Edge node, via FQDN): ssh -i {0}.pem {1}@{2}'. @@ -344,9 +344,9 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_ip_url}, #{"description": "Ungit (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py index 15f2ba3..fa29728 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py @@ -294,8 +294,8 @@ if __name__ == "__main__": dns_name = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) rstudio_ip_url = "http://" + ip_address + ":8787/" rstudio_dns_url = "http://" + dns_name + ":8787/" - rstudio_notebook_acces_url = "http://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) - rstudio_ungit_acces_url = "http://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) + rstudio_notebook_access_url = "https://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) + rstudio_ungit_access_url = "https://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -329,9 +329,9 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "RStudio", - "url": rstudio_notebook_acces_url}, + "url": rstudio_notebook_access_url}, {"description": "Ungit", - "url": rstudio_ungit_acces_url}#, + "url": rstudio_ungit_access_url}#, #{"description": "RStudio (via tunnel)", # "url": rstudio_ip_url}, #{"description": "Ungit (via tunnel)", 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 d1b42f9..3efc5fe 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py @@ -300,9 +300,9 @@ if __name__ == "__main__": tensorboard_url = "http://" + ip_address + ":6006/" rstudio_ip_url = "http://" + ip_address + ":8787/" rstudio_dns_url = "http://" + dns_name + ":8787/" - rstudio_notebook_acces_url = "http://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) - tensorboard_acces_url = "http://" + edge_instance_ip + "/{}-tensor/".format(notebook_config['exploratory_name']) - rstudio_ungit_acces_url = "http://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) + rstudio_notebook_access_url = "https://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) + tensorboard_access_url = "https://" + edge_instance_ip + "/{}-tensor/".format(notebook_config['exploratory_name']) + rstudio_ungit_access_url = "https://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -323,8 +323,10 @@ if __name__ == "__main__": print("Rstudio user: {}".format(notebook_config['dlab_ssh_user'])) print("Rstudio pass: {}".format(notebook_config['rstudio_pass'])) print("Ungit URL: {}".format(ungit_ip_url)) - print('SSH access (from Edge node, via IP address): ssh -i {0}.pem {1}@{2}'.format(notebook_config['key_name'], notebook_config['dlab_ssh_user'], ip_address)) - print('SSH access (from Edge node, via FQDN): ssh -i {0}.pem {1}@{2}'.format(notebook_config['key_name'], notebook_config['dlab_ssh_user'], dns_name)) + print('SSH access (from Edge node, via IP address): ssh -i {0}.pem {1}@{2}'.format( + notebook_config['key_name'], notebook_config['dlab_ssh_user'], ip_address)) + print('SSH access (from Edge node, via FQDN): ssh -i {0}.pem {1}@{2}'.format( + notebook_config['key_name'], notebook_config['dlab_ssh_user'], dns_name)) with open("/root/result.json", 'w') as result: res = {"hostname": dns_name, @@ -337,11 +339,11 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "RStudio", - "url": rstudio_notebook_acces_url}, + "url": rstudio_notebook_access_url}, {"description": "TensorBoard", - "url": tensorboard_acces_url}, + "url": tensorboard_access_url}, {"description": "Ungit", - "url": rstudio_ungit_acces_url}#, + "url": rstudio_ungit_access_url}#, #{"description": "RStudio (via tunnel)", # "url": rstudio_ip_url}, #{"description": "TensorBoard (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py index 365f014..415e5d9 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py @@ -294,9 +294,9 @@ if __name__ == "__main__": dns_name = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) tensorboard_url = "http://" + ip_address + ":6006/" jupyter_ip_url = "http://" + ip_address + ":8888/{}/".format(notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) - tensorboard_acces_url = "http://" + edge_instance_ip + "/{}-tensor/".format(notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) + jupyter_notebook_access_url = "https://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) + tensorboard_access_url = "https://" + edge_instance_ip + "/{}-tensor/".format(notebook_config['exploratory_name']) + jupyter_ungit_access_url = "https://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -314,8 +314,10 @@ if __name__ == "__main__": print("TensorBoard log dir: /var/log/tensorboard") print("Jupyter URL: {}".format(jupyter_ip_url)) print("Ungit URL: {}".format(ungit_ip_url)) - print('SSH access (from Edge node, via IP address): ssh -i {0}.pem {1}@{2}'.format(notebook_config['key_name'], notebook_config['dlab_ssh_user'], ip_address)) - print('SSH access (from Edge node, via FQDN): ssh -i {0}.pem {1}@{2}'.format(notebook_config['key_name'], notebook_config['dlab_ssh_user'], dns_name)) + print('SSH access (from Edge node, via IP address): ssh -i {0}.pem {1}@{2}'.format( + notebook_config['key_name'], notebook_config['dlab_ssh_user'], ip_address)) + print('SSH access (from Edge node, via FQDN): ssh -i {0}.pem {1}@{2}'.format( + notebook_config['key_name'], notebook_config['dlab_ssh_user'], dns_name)) with open("/root/result.json", 'w') as result: res = {"hostname": dns_name, @@ -328,11 +330,11 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "TensorBoard", - "url": tensorboard_acces_url}, + "url": tensorboard_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_ip_url}, #{"description": "TensorBoard (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py index 8853f9d..9c1e218 100644 --- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py @@ -313,8 +313,8 @@ if __name__ == "__main__": dns_name = get_instance_hostname(notebook_config['tag_name'], notebook_config['instance_name']) zeppelin_ip_url = "http://" + ip_address + ":8080/" zeppelin_dns_url = "http://" + dns_name + ":8080/" - zeppelin_notebook_acces_url = "http://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) - zeppelin_ungit_acces_url = "http://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) + zeppelin_notebook_access_url = "https://" + edge_instance_ip + "/{}/".format(notebook_config['exploratory_name']) + zeppelin_ungit_access_url = "https://" + edge_instance_ip + "/{}-ungit/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -346,9 +346,9 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Apache Zeppelin", - "url": zeppelin_notebook_acces_url}, + "url": zeppelin_notebook_access_url}, {"description": "Ungit", - "url": zeppelin_ungit_acces_url}#, + "url": zeppelin_ungit_access_url}#, #{"description": "Apache Zeppelin (via tunnel)", # "url": zeppelin_ip_url}, #{"description": "Ungit (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py index fea29cb..a31cfeb 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/dataengine_configure.py @@ -439,7 +439,7 @@ if __name__ == "__main__": ip_address = AzureMeta().get_private_ip_address(data_engine['resource_group_name'], data_engine['master_node_name']) spark_master_url = "http://" + ip_address + ":8080" - spark_master_acces_url = "http://" + edge_instance_hostname + "/{}/".format( + spark_master_access_url = "https://" + edge_instance_hostname + "/{}/".format( data_engine['exploratory_name'] + '_' + data_engine['computational_name']) logging.info('[SUMMARY]') print('[SUMMARY]') @@ -456,7 +456,7 @@ if __name__ == "__main__": "Action": "Create new Data Engine", "computational_url": [ {"description": "Apache Spark Master", - "url": spark_master_acces_url}, + "url": spark_master_access_url}, # {"description": "Apache Spark Master (via tunnel)", # "url": spark_master_url} ] diff --git a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py index 9f99221..5d34e92 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py @@ -330,11 +330,11 @@ if __name__ == "__main__": tensorboard_ip_url = 'http://' + ip_address + ':6006' jupyter_ip_url = 'http://' + ip_address + ':8888/{}/'.format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format( + jupyter_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format( notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + jupyter_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) - tensorboard_acces_url = "http://" + edge_instance_hostname + "/{}-tensor/".format( + tensorboard_access_url = "https://" + edge_instance_hostname + "/{}-tensor/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -359,11 +359,11 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "TensorBoard", - "url": tensorboard_acces_url}, + "url": tensorboard_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_ip_url}, #{"description": "TensorBoard (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py index 4785939..011d9c4 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py @@ -332,9 +332,9 @@ if __name__ == "__main__": notebook_config['instance_name']) jupyter_ip_url = "http://" + ip_address + ":8888/{}/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format( + jupyter_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format( notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + jupyter_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -358,9 +358,9 @@ if __name__ == "__main__": "notebook_image_name": notebook_config['notebook_image_name'], "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_ip_url}, #{"description": "Ungit (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py index 4c8588c..71aeab7 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py @@ -337,9 +337,9 @@ if __name__ == "__main__": notebook_config['instance_name']) rstudio_ip_url = "http://" + ip_address + ":8787/" ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - rstudio_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format( + rstudio_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format( notebook_config['exploratory_name']) - rstudio_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + rstudio_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -365,9 +365,9 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "RStudio", - "url": rstudio_notebook_acces_url}, + "url": rstudio_notebook_access_url}, {"description": "Ungit", - "url": rstudio_ungit_acces_url}#, + "url": rstudio_ungit_access_url}#, #{"description": "RStudio (via tunnel)", # "url": rstudio_ip_url}, #{"description": "Ungit (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py index 203829a..4e55204 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py @@ -329,11 +329,11 @@ if __name__ == "__main__": tensorboard_url = "http://" + ip_address + ":6006/" jupyter_ip_url = "http://" + ip_address + ":8888/{}/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format( + jupyter_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format( notebook_config['exploratory_name']) - tensorboard_acces_url = "http://" + edge_instance_hostname + "/{}-tensor/".format( + tensorboard_access_url = "https://" + edge_instance_hostname + "/{}-tensor/".format( notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + jupyter_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -360,11 +360,11 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "TensorBoard", - "url": tensorboard_acces_url}, + "url": tensorboard_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_ip_url}, #{"description": "TensorBoard (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py index 64e9498..c77741e 100644 --- a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py @@ -343,9 +343,9 @@ if __name__ == "__main__": notebook_config['instance_name']) zeppelin_ip_url = "http://" + ip_address + ":8080/" ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - zeppelin_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format( + zeppelin_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format( notebook_config['exploratory_name']) - zeppelin_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + zeppelin_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -369,9 +369,9 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Apache Zeppelin", - "url": zeppelin_notebook_acces_url}, + "url": zeppelin_notebook_access_url}, {"description": "Ungit", - "url": zeppelin_ungit_acces_url}#, + "url": zeppelin_ungit_access_url}#, #{"description": "Apache Zeppelin (via tunnel)", # "url": zeppelin_ip_url}, #{"description": "Ungit (via tunnel)", 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 73d348a..a5d9863 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine-service_configure.py @@ -197,7 +197,7 @@ if __name__ == "__main__": raise Exception try: - dataproc_master_acces_url = "http://" + dataproc_conf['edge_instance_hostname'] + "/{}/".format( + dataproc_master_access_url = "https://" + dataproc_conf['edge_instance_hostname'] + "/{}/".format( dataproc_conf['exploratory_name'] + '_' + dataproc_conf['computational_name']) logging.info('[SUMMARY]') print('[SUMMARY]') @@ -223,7 +223,7 @@ if __name__ == "__main__": "Action": "Create new Dataproc cluster", "computational_url": [ {"description": "Dataproc Master", - "url": dataproc_master_acces_url} + "url": dataproc_master_access_url} ] } print(json.dumps(res)) diff --git a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py index f396bdd..bbbd6de 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_configure.py @@ -392,7 +392,7 @@ if __name__ == "__main__": try: ip_address = GCPMeta().get_private_ip_address(data_engine['master_node_name']) spark_master_url = "http://" + ip_address + ":8080" - spark_master_acces_url = "http://" + edge_instance_hostname + "/{}/".format( + spark_master_access_url = "https://" + edge_instance_hostname + "/{}/".format( data_engine['exploratory_name'] + '_' + data_engine['computational_name']) logging.info('[SUMMARY]') print('[SUMMARY]') @@ -409,7 +409,7 @@ if __name__ == "__main__": "Action": "Create new Data Engine", "computational_url": [ {"description": "Apache Spark Master", - "url": spark_master_acces_url}, + "url": spark_master_access_url}, # {"description": "Apache Spark Master (via tunnel)", # "url": spark_master_url} ] diff --git a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py index c11639c..15f7011 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py @@ -264,10 +264,10 @@ if __name__ == "__main__": jupyter_ip_url = 'http://' + ip_address + ':8888/{}/'.format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format( notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + jupyter_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) + jupyter_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) - tensorboard_acces_url = "http://" + edge_instance_hostname + "/{}-tensor/".format(notebook_config['exploratory_name']) + tensorboard_access_url = "https://" + edge_instance_hostname + "/{}-tensor/".format(notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') print("Instance name: {}".format(notebook_config['instance_name'])) @@ -293,11 +293,11 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "TensorBoard", - "url": tensorboard_acces_url}, + "url": tensorboard_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_ip_url}, #{"description": "TensorBoard (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py index 7178cef..1d122e2 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py @@ -261,8 +261,8 @@ if __name__ == "__main__": ip_address = GCPMeta().get_private_ip_address(notebook_config['instance_name']) jupyter_ip_url = "http://" + ip_address + ":8888/{}/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + jupyter_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) + jupyter_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -288,9 +288,9 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_ip_url}, #{"description": "Ungit (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py index f4fd45e..f572c5f 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py @@ -267,8 +267,8 @@ if __name__ == "__main__": ip_address = GCPMeta().get_private_ip_address(notebook_config['instance_name']) rstudio_ip_url = "http://" + ip_address + ":8787/" ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - rstudio_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) - rstudio_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + rstudio_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) + rstudio_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -294,9 +294,9 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "RStudio", - "url": rstudio_notebook_acces_url}, + "url": rstudio_notebook_access_url}, {"description": "Ungit", - "url": rstudio_ungit_acces_url}#, + "url": rstudio_ungit_access_url}#, #{"description": "RStudio (via tunnel)", # "url": rstudio_ip_url}, #{"description": "Ungit (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py index 867b180..0f4a6f5 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py @@ -271,9 +271,9 @@ if __name__ == "__main__": tensorboard_url = "http://" + ip_address + ":6006/" rstudio_ip_url = "http://" + ip_address + ":8787/" ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - rstudio_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) - tensorboard_acces_url = "http://" + edge_instance_hostname + "/{}-tensor/".format(notebook_config['exploratory_name']) - rstudio_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + rstudio_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) + tensorboard_access_url = "https://" + edge_instance_hostname + "/{}-tensor/".format(notebook_config['exploratory_name']) + rstudio_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -302,11 +302,11 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Rstudio", - "url": rstudio_notebook_acces_url}, + "url": rstudio_notebook_access_url}, {"description": "TensorBoard", - "url": tensorboard_acces_url}, + "url": tensorboard_access_url}, {"description": "Ungit", - "url": rstudio_ungit_acces_url}#, + "url": rstudio_ungit_access_url}#, #{"description": "Rstudio (via tunnel)", # "url": rstudio_ip_url}, #{"description": "TensorBoard (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py index a6c081b..733b2cc 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py @@ -264,10 +264,10 @@ if __name__ == "__main__": tensorboard_url = "http://" + ip_address + ":6006/" jupyter_ip_url = "http://" + ip_address + ":8888/{}/".format(notebook_config['exploratory_name']) ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - jupyter_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) - tensorboard_acces_url = "http://" + edge_instance_hostname + "/{}-tensor/".format( + jupyter_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format(notebook_config['exploratory_name']) + tensorboard_access_url = "https://" + edge_instance_hostname + "/{}-tensor/".format( notebook_config['exploratory_name']) - jupyter_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + jupyter_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -294,11 +294,11 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Jupyter", - "url": jupyter_notebook_acces_url}, + "url": jupyter_notebook_access_url}, {"description": "TensorBoard", - "url": tensorboard_acces_url}, + "url": tensorboard_access_url}, {"description": "Ungit", - "url": jupyter_ungit_acces_url}#, + "url": jupyter_ungit_access_url}#, #{"description": "Jupyter (via tunnel)", # "url": jupyter_ip_url}, #{"description": "TensorBoard (via tunnel)", diff --git a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py index 15fb912..d2f7925 100644 --- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py +++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py @@ -279,9 +279,9 @@ if __name__ == "__main__": ip_address = GCPMeta().get_private_ip_address(notebook_config['instance_name']) zeppelin_ip_url = "http://" + ip_address + ":8080/" ungit_ip_url = "http://" + ip_address + ":8085/{}-ungit/".format(notebook_config['exploratory_name']) - zeppelin_notebook_acces_url = "http://" + edge_instance_hostname + "/{}/".format( + zeppelin_notebook_access_url = "https://" + edge_instance_hostname + "/{}/".format( notebook_config['exploratory_name']) - zeppelin_ungit_acces_url = "http://" + edge_instance_hostname + "/{}-ungit/".format( + zeppelin_ungit_access_url = "https://" + edge_instance_hostname + "/{}-ungit/".format( notebook_config['exploratory_name']) print('[SUMMARY]') logging.info('[SUMMARY]') @@ -305,9 +305,9 @@ if __name__ == "__main__": "Action": "Create new notebook server", "exploratory_url": [ {"description": "Apache Zeppelin", - "url": zeppelin_notebook_acces_url}, + "url": zeppelin_notebook_access_url}, {"description": "Ungit", - "url": zeppelin_ungit_acces_url}#, + "url": zeppelin_ungit_access_url}#, #{"description": "Apache Zeppelin (via tunnel)", # "url": zeppelin_ip_url}, #{"description": "Ungit (via tunnel)", --------------------------------------------------------------------- To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org For additional commands, e-mail: commits-h...@dlab.apache.org