This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-253
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-253 by this push:
new 4ed0a4f fixed issue with reverse proxy for jupyter
4ed0a4f is described below
commit 4ed0a4f9ab9e074bd7e8e384ea9da3bbcd1bd0dd
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Mar 13 13:15:42 2019 +0200
fixed issue with reverse proxy for jupyter
---
.../src/edge/scripts/configure_nginx_reverse_proxy.py | 3 ++-
infrastructure-provisioning/src/general/files/gcp/base_Dockerfile | 1 +
infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py | 3 ++-
infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py | 2 +-
.../src/general/scripts/gcp/jupyter_configure.py | 2 +-
.../src/general/scripts/os/common_configure_reverse_proxy.py | 2 +-
6 files changed, 8 insertions(+), 5 deletions(-)
diff --git
a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
index b7123a3..7772c50 100644
---
a/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
+++
b/infrastructure-provisioning/src/edge/scripts/configure_nginx_reverse_proxy.py
@@ -56,7 +56,8 @@ if __name__ == "__main__":
install_nginx_ldap(args.hostname,
os.environ['reverse_proxy_nginx_version'],
os.environ['ldap_hostname'], os.environ['ldap_dn'],
os.environ['ldap_ou'],
os.environ['ldap_service_password'],
- os.environ['ldap_service_username'],
os.environ['aws_iam_user'])
+ os.environ['ldap_service_username'],
os.environ['{}_iam_user'.format(
+ os.environ['conf_cloud_provider'])])
except Exception as err:
print("Failed install nginx reverse proxy: " + str(err))
sys.exit(1)
diff --git a/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
b/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
index 826de75..cb3839f 100644
--- a/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
+++ b/infrastructure-provisioning/src/general/files/gcp/base_Dockerfile
@@ -69,6 +69,7 @@ COPY ${SRC_PATH}general/lib/os/${OS}/common_lib.py
/usr/lib/python2.7/dlab/commo
COPY ${SRC_PATH}general/lib/os/fab.py /usr/lib/python2.7/dlab/fab.py
COPY ${SRC_PATH}general/files/os/${OS}/sources.list /root/files/
COPY ${SRC_PATH}general/files/os/ivysettings.xml /root/templates/
+COPY ${SRC_PATH}edge/templates/locations/ /root/locations/
RUN chmod a+x /root/*.py && \
chmod a+x /root/scripts/* && \
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
index 4f9d4c9..678041d 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_configure.py
@@ -64,7 +64,8 @@ if __name__ == "__main__":
edge_conf['edge_user_name'])
edge_conf['instance_name'] =
'{0}-{1}-edge'.format(edge_conf['service_base_name'],
edge_conf['edge_user_name'])
edge_conf['firewall_name'] = edge_conf['instance_name'] +
'{}-firewall'.format(edge_conf['instance_name'])
- edge_conf['notebook_firewall_name'] =
'{0}-{1}-nb-firewall'.format(edge_conf['service_base_name'],
edge_conf['edge_user_name'])
+ edge_conf['notebook_firewall_name'] =
'{0}-{1}-nb-firewall'.format(edge_conf['service_base_name'],
+
edge_conf['edge_user_name'])
edge_conf['bucket_name'] =
'{0}-{1}-bucket'.format(edge_conf['service_base_name'],
edge_conf['edge_user_name'])
edge_conf['shared_bucket_name'] =
'{}-shared-bucket'.format(edge_conf['service_base_name'])
edge_conf['instance_size'] = os.environ['gcp_edge_instance_size']
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
index 4ab4136..4d2893c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/edge_prepare.py
@@ -189,7 +189,7 @@ if __name__ == "__main__":
rules = [
{
'IPProtocol': 'tcp',
- 'ports': ['22']
+ 'ports': ['22', '80']
}
]
ingress_rule['allowed'] = rules
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
index 15b909a..a516485 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
@@ -52,7 +52,7 @@ if __name__ == "__main__":
notebook_config['exploratory_name'])
instance_hostname =
GCPMeta().get_private_ip_address(notebook_config['instance_name'])
edge_instance_name =
'{0}-{1}-edge'.format(notebook_config['service_base_name'],
notebook_config['edge_user_name'])
- edge_instance_hostname = get_instance_public_ip_by_name(edge_instance_name)
+ edge_instance_hostname =
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
notebook_config['ssh_key_path'] =
'{0}{1}.pem'.format(os.environ['conf_key_dir'], os.environ['conf_key_name'])
notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
notebook_config['zone'] = os.environ['gcp_zone']
diff --git
a/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
b/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
index 6d634ea..4e09b59 100644
---
a/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
+++
b/infrastructure-provisioning/src/general/scripts/os/common_configure_reverse_proxy.py
@@ -26,7 +26,7 @@ import json
import sys
from fabric.api import *
from jinja2 import Environment, FileSystemLoader
-from dlab.meta_lib import get_instance_private_ip_address,
get_instance_hostname
+from dlab.meta_lib import get_instance_private_ip_address
parser = argparse.ArgumentParser()
parser.add_argument('--edge_hostname', type=str, default='')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
