This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1468
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 66121dd9926c548bb5df4ee3d72ccc959834693a
Author: leonidfrolov <frolovl...@gmail.com>
AuthorDate: Tue Feb 18 17:33:38 2020 +0200
DLAB-1468 Removed usage of conf_shared_image_enabled parameter from py
scripts
---
.../general/scripts/aws/common_prepare_notebook.py | 8 +--
.../src/general/scripts/aws/dataengine_prepare.py | 8 +--
.../general/scripts/aws/deeplearning_configure.py | 25 +--------
.../src/general/scripts/aws/jupyter_configure.py | 22 +-------
.../general/scripts/aws/jupyterlab_configure.py | 41 ++++++--------
.../src/general/scripts/aws/rstudio_configure.py | 25 +--------
.../src/general/scripts/aws/ssn_configure.py | 4 --
.../scripts/aws/tensor-rstudio_configure.py | 25 +--------
.../src/general/scripts/aws/tensor_configure.py | 25 +--------
.../src/general/scripts/aws/zeppelin_configure.py | 25 +--------
.../scripts/azure/common_prepare_notebook.py | 10 +---
.../general/scripts/azure/dataengine_prepare.py | 8 +--
.../scripts/azure/deeplearning_configure.py | 19 +------
.../src/general/scripts/azure/jupyter_configure.py | 19 +------
.../src/general/scripts/azure/rstudio_configure.py | 19 +------
.../src/general/scripts/azure/ssn_configure.py | 4 --
.../src/general/scripts/azure/tensor_configure.py | 19 +------
.../general/scripts/azure/zeppelin_configure.py | 19 +------
.../general/scripts/gcp/common_prepare_notebook.py | 13 +----
.../src/general/scripts/gcp/dataengine_prepare.py | 13 +----
.../general/scripts/gcp/deeplearning_configure.py | 20 ++-----
.../src/general/scripts/gcp/jupyter_configure.py | 17 ++----
.../general/scripts/gcp/jupyterlab_configure.py | 62 +++++++++-------------
.../src/general/scripts/gcp/rstudio_configure.py | 19 ++-----
.../src/general/scripts/gcp/ssn_configure.py | 4 --
.../src/general/scripts/gcp/superset_configure.py | 20 ++-----
.../scripts/gcp/tensor-rstudio_configure.py | 19 ++-----
.../src/general/scripts/gcp/tensor_configure.py | 20 ++-----
.../src/general/scripts/gcp/zeppelin_configure.py | 19 ++-----
.../terraform/bin/deploy/endpoint_fab.py | 4 --
30 files changed, 91 insertions(+), 464 deletions(-)
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 7e5e0ef..39026f4 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/common_prepare_notebook.py
@@ -76,13 +76,7 @@ if __name__ == "__main__":
os.environ['project_name'], os.environ['endpoint_name'])
notebook_config['tag_name'] =
'{}-Tag'.format(notebook_config['service_base_name'])
- 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'],
+ 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'] = (lambda x:
'{0}-{1}-{2}-{3}'.format(notebook_config['service_base_name'],
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
index 62b6a95..cc7ca8f 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/dataengine_prepare.py
@@ -102,13 +102,7 @@ if __name__ == "__main__":
data_engine['primary_disk_size'] = '30'
data_engine['instance_class'] = 'dataengine'
- if os.environ['conf_shared_image_enabled'] == 'false':
- data_engine['expected_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(data_engine['service_base_name'],
-
os.environ['endpoint_name'],
-
os.environ['project_name'],
-
os.environ['application'])
- else:
- data_engine['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(data_engine['service_base_name'],
+ data_engine['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(data_engine['service_base_name'],
os.environ['endpoint_name'],
os.environ['application'])
data_engine['notebook_image_name'] = (
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
index 7d504d8..5030425 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/deeplearning_configure.py
@@ -58,15 +58,7 @@ if __name__ == "__main__":
os.environ['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'], args.uuid)
notebook_config['image_enabled'] = os.environ['conf_image_enabled']
- notebook_config['shared_image_enabled'] =
os.environ['conf_shared_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['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
os.environ['endpoint_name'],
os.environ['application'])
@@ -263,23 +255,10 @@ if __name__ == "__main__":
try:
print('[CREATING AMI]')
ami_id = get_ami_id_by_name(notebook_config['expected_image_name'])
- if ami_id == '' and notebook_config['shared_image_enabled'] ==
'false':
+ if ami_id == '':
print("Looks like it's first time we configure notebook
server. Creating image.")
try:
os.environ['conf_additional_tags'] = os.environ[
-
'conf_additional_tags'] + ';project_tag:{0};endpoint_tag:{1};'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- except KeyError:
- os.environ['conf_additional_tags'] =
'project_tag:{0};endpoint_tag:{1}'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- image_id =
create_image_from_instance(tag_name=notebook_config['tag_name'],
-
instance_name=notebook_config['instance_name'],
-
image_name=notebook_config['expected_image_name'])
- if image_id != '':
- print("Image was successfully created. It's ID is
{}".format(image_id))
- else:
- try:
- os.environ['conf_additional_tags'] = os.environ[
'conf_additional_tags'] + ';ami:shared;endpoint_tag:{};'.format(
os.environ['endpoint_name'])
except KeyError:
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
index 3ff45c8..4e88e94 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/jupyter_configure.py
@@ -57,15 +57,8 @@ if __name__ == "__main__":
notebook_config['instance_name'] =
'{}-{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'], args.uuid)
- 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'],
+ 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'))
@@ -276,18 +269,7 @@ if __name__ == "__main__":
try:
print('[CREATING AMI]')
ami_id = get_ami_id_by_name(notebook_config['expected_image_name'])
- if ami_id == '' and notebook_config['shared_image_enabled'] ==
'false':
- print("Looks like it's first time we configure notebook
server. Creating image.")
- try:
- os.environ['conf_additional_tags'] =
os.environ['conf_additional_tags'] +
';project_tag:{0};endpoint_tag:{1};'.format(os.environ['project_name'],
os.environ['endpoint_name'])
- except KeyError:
- os.environ['conf_additional_tags'] =
'project_tag:{0};endpoint_tag:{1}'.format(os.environ['project_name'],
os.environ['endpoint_name'])
- image_id =
create_image_from_instance(tag_name=notebook_config['tag_name'],
-
instance_name=notebook_config['instance_name'],
-
image_name=notebook_config['expected_image_name'])
- if image_id != '':
- print("Image was successfully created. It's ID is
{}".format(image_id))
- else:
+ if ami_id == '':
print("Looks like it's first time we configure notebook
server. Creating image.")
try:
os.environ['conf_additional_tags'] =
os.environ['conf_additional_tags'] +
';ami:shared;endpoint_tag:{};'.format(os.environ['endpoint_name'])
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
index b864fd4..ce5c9f9 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/jupyterlab_configure.py
@@ -56,16 +56,8 @@ if __name__ == "__main__":
notebook_config['instance_name'] =
'{}-{}-{}-nb-{}-{}'.format(notebook_config['service_base_name'],
os.environ['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'], args.uuid)
- 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['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
os.environ['endpoint_name'],
os.environ['application'])
@@ -272,22 +264,21 @@ if __name__ == "__main__":
remove_ec2(notebook_config['tag_name'],
notebook_config['instance_name'])
sys.exit(1)
- if notebook_config['shared_image_enabled'] == 'true':
- try:
- print('[CREATING AMI]')
- ami_id = get_ami_id_by_name(notebook_config['expected_image_name'])
- if ami_id == '':
- print("Looks like it's first time we configure notebook
server. Creating image.")
- image_id =
create_image_from_instance(tag_name=notebook_config['tag_name'],
-
instance_name=notebook_config['instance_name'],
-
image_name=notebook_config['expected_image_name'])
- if image_id != '':
- print("Image was successfully created. It's ID is
{}".format(image_id))
- except Exception as err:
- print('Error: {0}'.format(err))
- append_result("Failed creating image.", str(err))
- remove_ec2(notebook_config['tag_name'],
notebook_config['instance_name'])
- sys.exit(1)
+ try:
+ print('[CREATING AMI]')
+ ami_id = get_ami_id_by_name(notebook_config['expected_image_name'])
+ if ami_id == '':
+ print("Looks like it's first time we configure notebook server.
Creating image.")
+ image_id =
create_image_from_instance(tag_name=notebook_config['tag_name'],
+
instance_name=notebook_config['instance_name'],
+
image_name=notebook_config['expected_image_name'])
+ if image_id != '':
+ print("Image was successfully created. It's ID is
{}".format(image_id))
+ except Exception as err:
+ print('Error: {0}'.format(err))
+ append_result("Failed creating image.", str(err))
+ remove_ec2(notebook_config['tag_name'],
notebook_config['instance_name'])
+ sys.exit(1)
try:
print('[CONFIGURING PROXY FOR DOCKER]')
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
index 574ad47..7fd732d 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/rstudio_configure.py
@@ -59,15 +59,7 @@ if __name__ == "__main__":
os.environ['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'], args.uuid)
notebook_config['image_enabled'] = os.environ['conf_image_enabled']
- notebook_config['shared_image_enabled'] =
os.environ['conf_shared_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['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
os.environ['endpoint_name'],
os.environ['application'])
@@ -256,23 +248,10 @@ if __name__ == "__main__":
try:
print('[CREATING AMI]')
ami_id =
get_ami_id_by_name(`notebook_config['expected_image_name']`)
- if ami_id == '' and notebook_config['shared_image_enabled'] ==
'false':
+ if ami_id == '':
print("Looks like it's first time we configure notebook
server. Creating image.")
try:
os.environ['conf_additional_tags'] = os.environ[
-
'conf_additional_tags'] + ';project_tag:{0};endpoint_tag:{1};'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- except KeyError:
- os.environ['conf_additional_tags'] =
'project_tag:{0};endpoint_tag:{1}'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- image_id =
create_image_from_instance(tag_name=notebook_config['tag_name'],
-
instance_name=notebook_config['instance_name'],
-
image_name=notebook_config['expected_image_name'])
- if image_id != '':
- print("Image was successfully created. It's ID is
{}".format(image_id))
- else:
- try:
- os.environ['conf_additional_tags'] = os.environ[
'conf_additional_tags'] + ';ami:shared;endpoint_tag:{};'.format(
os.environ['endpoint_name'])
except KeyError:
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
index a4d6dbc..9259032 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/ssn_configure.py
@@ -466,10 +466,6 @@ if __name__ == "__main__":
'value': ''
},
{
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
- {
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
},
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 a10ccae..80ba2a0 100644
---
a/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/aws/tensor-rstudio_configure.py
@@ -60,15 +60,7 @@ if __name__ == "__main__":
os.environ['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'], args.uuid)
notebook_config['image_enabled'] = os.environ['conf_image_enabled']
- notebook_config['shared_image_enabled'] =
os.environ['conf_shared_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['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
os.environ['endpoint_name'],
os.environ['application'])
@@ -261,23 +253,10 @@ if __name__ == "__main__":
try:
print('[CREATING AMI]')
ami_id = get_ami_id_by_name(notebook_config['expected_image_name'])
- if ami_id == '' and notebook_config['shared_image_enabled'] ==
'false':
+ if ami_id == '':
print("Looks like it's first time we configure notebook
server. Creating image.")
try:
os.environ['conf_additional_tags'] = os.environ[
-
'conf_additional_tags'] + ';project_tag:{0};endpoint_tag:{1};'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- except KeyError:
- os.environ['conf_additional_tags'] =
'project_tag:{0};endpoint_tag:{1}'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- image_id =
create_image_from_instance(tag_name=notebook_config['tag_name'],
-
instance_name=notebook_config['instance_name'],
-
image_name=notebook_config['expected_image_name'])
- if image_id != '':
- print("Image was successfully created. It's ID is
{}".format(image_id))
- else:
- try:
- os.environ['conf_additional_tags'] = os.environ[
'conf_additional_tags'] + ';ami:shared;endpoint_tag:{};'.format(
os.environ['endpoint_name'])
except KeyError:
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
index ebcb814..4766291 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/tensor_configure.py
@@ -60,15 +60,7 @@ if __name__ == "__main__":
os.environ['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'], args.uuid)
notebook_config['image_enabled'] = os.environ['conf_image_enabled']
- notebook_config['shared_image_enabled'] =
os.environ['conf_shared_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['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
os.environ['endpoint_name'],
os.environ['application'])
@@ -256,23 +248,10 @@ if __name__ == "__main__":
try:
print('[CREATING AMI]')
ami_id = get_ami_id_by_name(notebook_config['expected_image_name'])
- if ami_id == '' and notebook_config['shared_image_enabled'] ==
'false':
+ if ami_id == '':
print("Looks like it's first time we configure notebook
server. Creating image.")
try:
os.environ['conf_additional_tags'] = os.environ[
-
'conf_additional_tags'] + ';project_tag:{0};endpoint_tag:{1};'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- except KeyError:
- os.environ['conf_additional_tags'] =
'project_tag:{0};endpoint_tag:{1}'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- image_id =
create_image_from_instance(tag_name=notebook_config['tag_name'],
-
instance_name=notebook_config['instance_name'],
-
image_name=notebook_config['expected_image_name'])
- if image_id != '':
- print("Image was successfully created. It's ID is
{}".format(image_id))
- else:
- try:
- os.environ['conf_additional_tags'] = os.environ[
'conf_additional_tags'] + ';ami:shared;endpoint_tag:{};'.format(
os.environ['endpoint_name'])
except KeyError:
diff --git
a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
index 8e8e94b..c5f2510 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/zeppelin_configure.py
@@ -60,15 +60,7 @@ if __name__ == "__main__":
os.environ['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'], args.uuid)
notebook_config['image_enabled'] = os.environ['conf_image_enabled']
- notebook_config['shared_image_enabled'] =
os.environ['conf_shared_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['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
os.environ['endpoint_name'],
os.environ['application'])
@@ -275,23 +267,10 @@ if __name__ == "__main__":
try:
print('[CREATING AMI]')
ami_id =
get_ami_id_by_name(`notebook_config['expected_image_name']`)
- if ami_id == '' and notebook_config['shared_image_enabled'] ==
'false':
+ if ami_id == '':
print("Looks like it's first time we configure notebook
server. Creating image.")
try:
os.environ['conf_additional_tags'] = os.environ[
-
'conf_additional_tags'] + ';project_tag:{0};endpoint_tag:{1};'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- except KeyError:
- os.environ['conf_additional_tags'] =
'project_tag:{0};endpoint_tag:{1}'.format(
- os.environ['project_name'],
os.environ['endpoint_name'])
- image_id =
create_image_from_instance(tag_name=notebook_config['tag_name'],
-
instance_name=notebook_config['instance_name'],
-
image_name=notebook_config['expected_image_name'])
- if image_id != '':
- print("Image was successfully created. It's ID is
{}".format(image_id))
- else:
- try:
- os.environ['conf_additional_tags'] = os.environ[
'conf_additional_tags'] + ';ami:shared;endpoint_tag:{};'.format(
os.environ['endpoint_name'])
except KeyError:
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
b/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
index d5be204..9b07ebd 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/common_prepare_notebook.py
@@ -90,15 +90,7 @@ if __name__ == "__main__":
sudo_group = 'wheel'
notebook_config['image_type'] = 'default'
- notebook_config['shared_image_enabled'] =
os.environ['conf_shared_image_enabled']
- if notebook_config['shared_image_enabled'] == 'false':
- notebook_config['expected_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(
- notebook_config['service_base_name'],
- notebook_config['endpoint_name'],
- notebook_config['project_name'],
- notebook_config['application'])
- else:
- notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
+ notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
notebook_config['endpoint_name'],
notebook_config['application'])
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
index 24855fa..6279555 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/dataengine_prepare.py
@@ -105,13 +105,7 @@ if __name__ == "__main__":
data_engine['primary_disk_size'] = '32'
data_engine['image_type'] = 'default'
- if os.environ['conf_shared_image_enabled'] == 'false':
- data_engine['expected_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(data_engine['service_base_name'],
-
os.environ['endpoint_name'],
-
os.environ['project_name'],
-
os.environ['application'])
- else:
- data_engine['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(data_engine['service_base_name'],
+ data_engine['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(data_engine['service_base_name'],
os.environ['endpoint_name'],
os.environ['application'])
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
index 3a64bf6..b35e71b 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/deeplearning_configure.py
@@ -58,26 +58,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(
+ notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
notebook_config['endpoint_name'],
- notebook_config['project_name'],
os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
- "SBN":
notebook_config['service_base_name'],
- "User":
notebook_config['user_name'],
- "project_tag":
notebook_config['project_tag'],
- "endpoint_tag":
notebook_config['endpoint_tag'],
- "Exploratory":
notebook_config['exploratory_name'],
-
os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']}
- else:
- notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
- notebook_config['service_base_name'],
- notebook_config['endpoint_name'],
- os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
+ notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
"SBN":
notebook_config['service_base_name'],
"User":
notebook_config['user_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
index 8d9ac96..23583ad 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/jupyter_configure.py
@@ -57,26 +57,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(
- notebook_config['service_base_name'],
- notebook_config['endpoint_name'],
- notebook_config['project_name'],
- os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
- "SBN":
notebook_config['service_base_name'],
- "User": notebook_config['user_name'],
- "project_tag":
notebook_config['project_tag'],
- "endpoint_tag":
notebook_config['endpoint_tag'],
- "Exploratory":
notebook_config['exploratory_name'],
- os.environ['conf_billing_tag_key']:
os.environ['conf_billing_tag_value']}
- else:
- notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
+ notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
notebook_config['endpoint_name'],
os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
+ notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
"SBN":
notebook_config['service_base_name'],
"User": notebook_config['user_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
index a9d2e50..58d7707 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/rstudio_configure.py
@@ -58,26 +58,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(
+ notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
notebook_config['endpoint_name'],
- notebook_config['project_name'],
os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
- "SBN":
notebook_config['service_base_name'],
- "User":
notebook_config['user_name'],
- "project_tag":
notebook_config['project_tag'],
- "endpoint_tag":
notebook_config['endpoint_tag'],
- "Exploratory":
notebook_config['exploratory_name'],
-
os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']}
- else:
- notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
- notebook_config['service_base_name'],
- notebook_config['endpoint_name'],
- os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
+ notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
"SBN":
notebook_config['service_base_name'],
"User":
notebook_config['user_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
index 02c4eaa..addf3cf 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/ssn_configure.py
@@ -312,10 +312,6 @@ if __name__ == "__main__":
'value': ''
},
{
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
- {
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
},
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
index 107f52d..d4040d2 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/tensor_configure.py
@@ -60,26 +60,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(
+ notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
notebook_config['endpoint_name'],
- notebook_config['project_name'],
os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
- "SBN":
notebook_config['service_base_name'],
- "User":
notebook_config['user_name'],
- "project_tag":
notebook_config['project_tag'],
- "endpoint_tag":
notebook_config['endpoint_tag'],
- "Exploratory":
notebook_config['exploratory_name'],
-
os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']}
- else:
- notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
- notebook_config['service_base_name'],
- notebook_config['endpoint_name'],
- os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
+ notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
"SBN":
notebook_config['service_base_name'],
"User":
notebook_config['user_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
index e73c023..61632ba 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/zeppelin_configure.py
@@ -59,26 +59,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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_image_name'] =
'{0}-{1}-{2}-{3}-notebook-image'.format(
+ notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
notebook_config['service_base_name'],
notebook_config['endpoint_name'],
- notebook_config['project_name'],
os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
- "SBN":
notebook_config['service_base_name'],
- "User":
notebook_config['user_name'],
- "project_tag":
notebook_config['project_tag'],
- "endpoint_tag":
notebook_config['endpoint_tag'],
- "Exploratory":
notebook_config['exploratory_name'],
-
os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']}
- else:
- notebook_config['expected_image_name'] =
'{0}-{1}-{2}-notebook-image'.format(
- notebook_config['service_base_name'],
- notebook_config['endpoint_name'],
- os.environ['application'])
- notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
+ notebook_config['image_tags'] = {"Name":
notebook_config['instance_name'],
"SBN":
notebook_config['service_base_name'],
"User":
notebook_config['user_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
index 7f14dab..d097c6e 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/common_prepare_notebook.py
@@ -90,18 +90,9 @@ if __name__ == "__main__":
notebook_config['primary_disk_size'] = (lambda x: '30' if x ==
'deeplearning' else '12')(os.environ['application'])
notebook_config['secondary_disk_size'] = os.environ['notebook_disk_size']
- 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'])
- else:
- notebook_config['expected_primary_image_name'] =
'{}-{}-{}-primary-image'.format(
+ 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['expected_secondary_image_name'] =
'{}-{}-{}-secondary-image'.format(
notebook_config['service_base_name'],
notebook_config['endpoint_tag'], os.environ['application'])
notebook_config['notebook_primary_image_name'] = (lambda x:
os.environ['notebook_primary_image_name'] if x != 'None'
else
notebook_config['expected_primary_image_name'])(str(os.environ.get('notebook_primary_image_name')))
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
index 2776834..4758a7c 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/dataengine_prepare.py
@@ -103,18 +103,9 @@ if __name__ == "__main__":
data_engine['primary_disk_size'] = '30'
data_engine['secondary_disk_size'] = os.environ['notebook_disk_size']
- data_engine['shared_image_enabled'] =
os.environ['conf_shared_image_enabled']
- if data_engine['shared_image_enabled'] == 'false':
- data_engine['expected_primary_image_name'] =
'{}-{}-{}-{}-primary-image'.format(
- data_engine['service_base_name'], data_engine['endpoint_tag'],
data_engine['project_name'],
- os.environ['application'])
- data_engine['expected_secondary_image_name'] =
'{}-{}-{}-{}-secondary-image'.format(
- data_engine['service_base_name'], data_engine['endpoint_tag'],
data_engine['project_name'],
- os.environ['application'])
- else:
- data_engine['expected_primary_image_name'] =
'{}-{}-{}-primary-image'.format(
+ data_engine['expected_primary_image_name'] =
'{}-{}-{}-primary-image'.format(
data_engine['service_base_name'], data_engine['endpoint_tag'],
os.environ['application'])
- data_engine['expected_secondary_image_name'] =
'{}-{}-{}-secondary-image'.format(
+ data_engine['expected_secondary_image_name'] =
'{}-{}-{}-secondary-image'.format(
data_engine['service_base_name'], data_engine['endpoint_tag'],
os.environ['application'])
data_engine['notebook_primary_image_name'] = (lambda x:
os.environ['notebook_primary_image_name'] if x != 'None'
else
data_engine['expected_primary_image_name'])(str(os.environ.get('notebook_primary_image_name')))
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
index 4f18e12..0ddbe08 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/deeplearning_configure.py
@@ -54,24 +54,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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['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['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'],
+ notebook_config['image_labels'] = {"sbn":
notebook_config['service_base_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
"product": "dlab"}
# generating variables regarding EDGE proxy on Notebook instance
@@ -83,7 +70,6 @@ if __name__ == "__main__":
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':
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
index 79794b7..a5efe88 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/jupyter_configure.py
@@ -54,22 +54,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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['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['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'],
+ 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'])
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
index b41b024..b043cbd 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/jupyterlab_configure.py
@@ -75,24 +75,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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['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['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'],
+ 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'])
@@ -226,28 +213,27 @@ if __name__ == "__main__":
GCPActions().remove_instance(notebook_config['instance_name'],
notebook_config['zone'])
sys.exit(1)
- if notebook_config['shared_image_enabled'] == 'true':
- try:
- print('[CREATING IMAGE]')
- primary_image_id =
GCPMeta().get_image_by_name(notebook_config['expected_primary_image_name'])
- if primary_image_id == '':
- print("Looks like it's first time we configure notebook
server. Creating images.")
- image_id_list = GCPActions().create_image_from_instance_disks(
- notebook_config['expected_primary_image_name'],
notebook_config['expected_secondary_image_name'],
- notebook_config['instance_name'], notebook_config['zone'],
notebook_config['image_labels'])
- if image_id_list and image_id_list[0] != '':
- print("Image of primary disk was successfully created.
It's ID is {}".format(image_id_list[0]))
- else:
- print("Looks like another image creating operation for
your template have been started a moment ago.")
- if image_id_list and image_id_list[1] != '':
- print("Image of secondary disk was successfully created.
It's ID is {}".format(image_id_list[1]))
- except Exception as err:
- print('Error: {0}'.format(err))
- append_result("Failed creating image.", str(err))
- GCPActions().remove_instance(notebook_config['instance_name'],
notebook_config['zone'])
-
GCPActions().remove_image(notebook_config['expected_primary_image_name'])
-
GCPActions().remove_image(notebook_config['expected_secondary_image_name'])
- sys.exit(1)
+ try:
+ print('[CREATING IMAGE]')
+ primary_image_id =
GCPMeta().get_image_by_name(notebook_config['expected_primary_image_name'])
+ if primary_image_id == '':
+ print("Looks like it's first time we configure notebook server.
Creating images.")
+ image_id_list = GCPActions().create_image_from_instance_disks(
+ notebook_config['expected_primary_image_name'],
notebook_config['expected_secondary_image_name'],
+ notebook_config['instance_name'], notebook_config['zone'],
notebook_config['image_labels'])
+ if image_id_list and image_id_list[0] != '':
+ print("Image of primary disk was successfully created. It's ID
is {}".format(image_id_list[0]))
+ else:
+ print("Looks like another image creating operation for your
template have been started a moment ago.")
+ if image_id_list and image_id_list[1] != '':
+ print("Image of secondary disk was successfully created. It's
ID is {}".format(image_id_list[1]))
+ except Exception as err:
+ print('Error: {0}'.format(err))
+ append_result("Failed creating image.", str(err))
+ GCPActions().remove_instance(notebook_config['instance_name'],
notebook_config['zone'])
+
GCPActions().remove_image(notebook_config['expected_primary_image_name'])
+
GCPActions().remove_image(notebook_config['expected_secondary_image_name'])
+ sys.exit(1)
try:
print('[SETUP EDGE REVERSE PROXY TEMPLATE]')
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
index d5e5b08..5ff97f8 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/rstudio_configure.py
@@ -55,24 +55,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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['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['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'],
+ notebook_config['image_labels'] = {"sbn":
notebook_config['service_base_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
"product": "dlab"}
# generating variables regarding EDGE proxy on Notebook instance
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 87cd29a..cbc1673 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -407,10 +407,6 @@ if __name__ == "__main__":
'value': ''
},
{
- 'key': 'SHARED_IMAGE_ENABLED',
- 'value': os.environ['conf_shared_image_enabled']
- },
- {
'key': 'CONF_IMAGE_ENABLED',
'value': os.environ['conf_image_enabled']
},
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
index 6cfd891..e1afac9 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/superset_configure.py
@@ -55,24 +55,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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['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['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'],
+ 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'])
@@ -83,7 +70,6 @@ if __name__ == "__main__":
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']
notebook_config['image_labels'] = {"sbn":
notebook_config['service_base_name'],
"project_tag":
notebook_config['project_tag'],
"endpoint_tag":
notebook_config['endpoint_tag'],
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 f791e74..b6e4423 100644
---
a/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
+++
b/infrastructure-provisioning/src/general/scripts/gcp/tensor-rstudio_configure.py
@@ -60,24 +60,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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['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['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'],
+ notebook_config['image_labels'] = {"sbn":
notebook_config['service_base_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
"product": "dlab"}
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
index 950a1c0..b925888 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/tensor_configure.py
@@ -56,24 +56,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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['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['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'],
+ notebook_config['image_labels'] = {"sbn":
notebook_config['service_base_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
"product": "dlab"}
# generating variables regarding EDGE proxy on Notebook instance
@@ -85,7 +72,6 @@ if __name__ == "__main__":
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':
diff --git
a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
index 7981005..aee7792 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/zeppelin_configure.py
@@ -56,24 +56,11 @@ if __name__ == "__main__":
notebook_config['project_name'], os.environ['endpoint_name'],
notebook_config['exploratory_name'])
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['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['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'],
+ notebook_config['image_labels'] = {"sbn":
notebook_config['service_base_name'],
"endpoint_tag":
notebook_config['endpoint_tag'],
"product": "dlab"}
# generating variables regarding EDGE proxy on Notebook instance
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 00111db..842ade8 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -485,10 +485,6 @@ def
configure_supervisor_endpoint(endpoint_keystore_password):
'value': args.step_ca_url
},
{
- 'key': "SHARED_IMAGE_ENABLED",
- 'value': args.shared_image_enabled
- },
- {
'key': "CONF_IMAGE_ENABLED",
'value': args.image_enabled
},
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscr...@dlab.apache.org
For additional commands, e-mail: commits-h...@dlab.apache.org
