This is an automated email from the ASF dual-hosted git repository.
dmysakovets pushed a commit to branch DLAB-433
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-433 by this push:
new 8afa1cd [DLAB-433] Fixing bugs after branch update
8afa1cd is described below
commit 8afa1cdf77d6e607846f3627eff5c4309bb99851
Author: Demyan Mysakovets <demian.mysakove...@gmail.com>
AuthorDate: Wed Nov 6 11:45:45 2019 +0200
[DLAB-433] Fixing bugs after branch update
---
.../scripts/aws/jupyter-docker_configure.py | 26 +++++++++++++-----
.../scripts/gcp/jupyter-docker_configure.py | 32 ++++++++++++++++++----
2 files changed, 45 insertions(+), 13 deletions(-)
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/jupyter-docker_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/jupyter-docker_configure.py
index 7385cc6..0d3f89f 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/jupyter-docker_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/jupyter-docker_configure.py
@@ -56,23 +56,35 @@ if __name__ == "__main__":
notebook_config['instance_name'] =
'{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'],
os.environ['edge_user_name'],
notebook_config['exploratory_name'], args.uuid)
- notebook_config['expected_image_name'] =
'{}-{}-notebook-image'.format(notebook_config['service_base_name'],
-
os.environ['application'])
+ notebook_config['shared_image_enabled'] =
os.environ['conf_shared_image_enabled']
+ notebook_config['image_enabled'] = os.environ['conf_image_enabled']
+ if os.environ['conf_shared_image_enabled'] == 'false':
+ notebook_config['expected_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(
+ notebook_config['service_base_name'],
+ os.environ['endpoint_name'],
+ os.environ['project_name'],
+ os.environ['application'])
+ else:
+ notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
+ notebook_config['service_base_name'],
+ os.environ['endpoint_name'],
+ os.environ['application'])
notebook_config['notebook_image_name'] =
str(os.environ.get('notebook_image_name'))
notebook_config['role_profile_name'] = '{}-{}-nb-de-Profile' \
- .format(notebook_config['service_base_name'].lower().replace('-',
'_'), os.environ['edge_user_name'])
- notebook_config['security_group_name'] =
'{}-{}-nb-SG'.format(notebook_config['service_base_name'],
-
os.environ['edge_user_name'])
+ .format(notebook_config['service_base_name'].lower().replace('-',
'_'), os.environ['project_name'])
+ notebook_config['security_group_name'] =
'{}-{}-nb-sg'.format(notebook_config['service_base_name'],
+
os.environ['project_name'])
notebook_config['tag_name'] =
'{}-Tag'.format(notebook_config['service_base_name'])
notebook_config['dlab_ssh_user'] = os.environ['conf_os_user']
- notebook_config['shared_image_enabled'] =
os.environ['conf_shared_image_enabled']
notebook_config['ip_address'] =
get_instance_ip_address(notebook_config['tag_name'],
notebook_config['instance_name']).get('Private')
# generating variables regarding EDGE proxy on Notebook instance
instance_hostname = get_instance_hostname(notebook_config['tag_name'],
notebook_config['instance_name'])
- edge_instance_name = os.environ['conf_service_base_name'] + "-" +
os.environ['edge_user_name'] + '-edge'
+ edge_instance_name =
'{}-{}-{}-edge'.format(notebook_config['service_base_name'],
+ os.environ['project_name'],
os.environ['endpoint_name'])
edge_instance_hostname =
get_instance_hostname(notebook_config['tag_name'], edge_instance_name)
+ edge_instance_private_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
if notebook_config['network_type'] == 'private':
edge_instance_ip =
get_instance_ip_address(notebook_config['tag_name'],
edge_instance_name).get('Private')
else:
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter-docker_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter-docker_configure.py
index d1104e6..1bc001b 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter-docker_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter-docker_configure.py
@@ -69,21 +69,41 @@ if __name__ == "__main__":
notebook_config['key_name'] = os.environ['conf_key_name']
notebook_config['edge_user_name'] =
(os.environ['edge_user_name']).lower().replace('_', '-')
notebook_config['project_name'] =
(os.environ['project_name']).lower().replace('_', '-')
+ notebook_config['project_tag'] =
(os.environ['project_name']).lower().replace('_', '-')
+ notebook_config['endpoint_tag'] =
(os.environ['endpoint_name']).lower().replace('_', '-')
notebook_config['instance_name'] =
'{0}-{1}-nb-{2}'.format(notebook_config['service_base_name'],
notebook_config['project_name'],
notebook_config['exploratory_name'])
- notebook_config['expected_primary_image_name'] =
'{}-{}-notebook-primary-image'.format(
-
notebook_config['service_base_name'], os.environ['application'])
- notebook_config['expected_secondary_image_name'] =
'{}-{}-notebook-secondary-image'.format(
-
notebook_config['service_base_name'], os.environ['application'])
+ notebook_config['image_enabled'] = os.environ['conf_image_enabled']
+ notebook_config['shared_image_enabled'] =
os.environ['conf_shared_image_enabled']
+ if notebook_config['shared_image_enabled'] == 'false':
+ notebook_config['expected_primary_image_name'] =
'{}-{}-{}-{}-primary-image'.format(
+ notebook_config['service_base_name'],
notebook_config['endpoint_tag'], notebook_config['project_name'],
+ os.environ['application'])
+ notebook_config['expected_secondary_image_name'] =
'{}-{}-{}-secondary-image'.format(
+ notebook_config['service_base_name'],
notebook_config['endpoint_tag'], notebook_config['project_name'],
+ os.environ['application'])
+ notebook_config['image_labels'] = {"sbn":
notebook_config['service_base_name'],
+ "endpoint_tag":
notebook_config['endpoint_tag'],
+ "project_tag":
notebook_config['project_tag'],
+ "product": "dlab"}
+ else:
+ notebook_config['expected_primary_image_name'] =
'{}-{}-{}-primary-image'.format(
+ notebook_config['service_base_name'],
notebook_config['endpoint_tag'], os.environ['application'])
+ notebook_config['expected_secondary_image_name'] =
'{}-{}-{}-secondary-image'.format(
+ notebook_config['service_base_name'],
notebook_config['endpoint_tag'], os.environ['application'])
+ notebook_config['image_labels'] = {"sbn":
notebook_config['service_base_name'],
+ "endpoint_tag":
notebook_config['endpoint_tag'],
+ "product": "dlab"}
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['project_name'])
+ edge_instance_name =
'{0}-{1}-{2}-edge'.format(notebook_config['service_base_name'],
+
notebook_config['project_name'], notebook_config['endpoint_tag'])
edge_instance_hostname =
GCPMeta().get_instance_public_ip_by_name(edge_instance_name)
edge_instance_private_ip =
GCPMeta().get_private_ip_address(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']
- notebook_config['shared_image_enabled'] =
os.environ['conf_shared_image_enabled']
+
try:
if os.environ['conf_os_family'] == 'debian':
initial_user = 'ubuntu'
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
