You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dlab.apache.org by lf...@apache.org on 2020/02/20 16:14:01 UTC
[incubator-dlab] branch DLAB-1531 updated (933c100 -> 2c82d6a)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 933c100 DLAB-1531 updated code
new 3b18859 DLAB-1531 changed one of gcp bucket tags
new 2c82d6a DLAB-1531 changed name bucket tags in azure and fixed typo
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../src/general/scripts/azure/project_prepare.py | 6 +++---
.../src/general/scripts/gcp/project_prepare.py | 5 +++--
2 files changed, 6 insertions(+), 5 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/02: DLAB-1531 changed one of gcp bucket tags
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 3b188593f7dab9aef23b51c423724af8b4621c02
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 20 18:07:38 2020 +0200
DLAB-1531 changed one of gcp bucket tags
---
.../src/general/scripts/gcp/project_prepare.py | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index 5b44d66..62cf4e3 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -100,6 +100,7 @@ if __name__ == "__main__":
"project_tag": project_conf['project_tag'],
"endpoint_tag": project_conf['endpoint_tag'],
"product": "dlab"}
+ project_conf['tag_name'] = notebook_config['service_base_name'] + '-tag'
project_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr']
if 'conf_user_subnets_range' in os.environ:
project_conf['user_subnets_range'] = os.environ['conf_user_subnets_range']
@@ -367,7 +368,7 @@ if __name__ == "__main__":
logging.info('[CREATE BUCKETS]')
print('[CREATE BUCKETS]')
project_conf['shared_bucket_tags'] = {
- "name": project_conf['shared_bucket_name'],
+ project_conf['tag_name']: project_conf['shared_bucket_name'],
"endpoint_tag": project_conf['endpoint_tag'],
os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value'],
"sbn": project_conf['service_base_name']}
@@ -379,7 +380,7 @@ if __name__ == "__main__":
raise Exception
project_conf['bucket_tags'] = {
- "name": project_conf['bucket_name'],
+ project_conf['tag_name']: project_conf['bucket_name'],
"endpoint_tag": project_conf['endpoint_tag'],
os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value'],
"sbn": project_conf['service_base_name'],
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 02/02: DLAB-1531 changed name bucket tags in azure
and fixed typo
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 2c82d6abb1cb914bfa666f1f7121575184620857
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 20 18:13:44 2020 +0200
DLAB-1531 changed name bucket tags in azure and fixed typo
---
.../src/general/scripts/azure/project_prepare.py | 6 +++---
.../src/general/scripts/gcp/project_prepare.py | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index 7976d5a..db1ad75 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -60,7 +60,7 @@ if __name__ == "__main__":
project_conf['region'] = os.environ['azure_region']
project_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
project_conf['private_subnet_prefix'] = os.environ['conf_private_subnet_prefix']
-
+ project_conf['tag_name'] = project_conf['service_base_name'] + '-tag'
project_conf['instance_name'] = '{0}-{1}-{2}-edge'.format(project_conf['service_base_name'],
project_conf['project_name'],
project_conf['endpoint_tag'])
@@ -91,7 +91,7 @@ if __name__ == "__main__":
"project_tag": project_conf['project_tag'],
"endpoint_tag": project_conf['endpoint_tag'],
os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']}
- project_conf['storage_account_tags'] = {"Name": project_conf['edge_storage_account_name'],
+ project_conf['storage_account_tags'] = {project_conf['tag_name']: project_conf['edge_storage_account_name'],
"SBN": project_conf['service_base_name'],
"project_tag": project_conf['project_tag'],
"endpoint_tag": project_conf['endpoint_tag'],
@@ -100,7 +100,7 @@ if __name__ == "__main__":
project_conf['shared_storage_account_name'] = '{0}-{1}-shared-storage'.format(project_conf['service_base_name'],
project_conf['endpoint_name'])
project_conf['shared_container_name'] = '{}-{}-shared-container'.format(project_conf['service_base_name'], project_conf['endpoint_name']).lower()
- project_conf['shared_storage_account_tags'] = {"Name": project_conf['shared_storage_account_name'],
+ project_conf['shared_storage_account_tags'] = {project_conf['tag_name']: project_conf['shared_storage_account_name'],
"SBN": project_conf['service_base_name'],
os.environ['conf_billing_tag_key']: os.environ[
'conf_billing_tag_value'], "endpoint_tag": project_conf['endpoint_tag'],}
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index 62cf4e3..82edc16 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -100,7 +100,7 @@ if __name__ == "__main__":
"project_tag": project_conf['project_tag'],
"endpoint_tag": project_conf['endpoint_tag'],
"product": "dlab"}
- project_conf['tag_name'] = notebook_config['service_base_name'] + '-tag'
+ project_conf['tag_name'] = project_conf['service_base_name'] + '-tag'
project_conf['allowed_ip_cidr'] = os.environ['conf_allowed_ip_cidr']
if 'conf_user_subnets_range' in os.environ:
project_conf['user_subnets_range'] = os.environ['conf_user_subnets_range']
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org