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:02 UTC
[incubator-dlab] 01/02: DLAB-1531 changed one of gcp bucket tags
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