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 08:30:19 UTC
[incubator-dlab] 02/04: DLAB-1531 corrected additional tags for
shared bucket
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 376ed8e40f465c4150c1d684928888b24d6d33fc
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Wed Feb 19 17:24:13 2020 +0200
DLAB-1531 corrected additional tags for shared bucket
---
.../src/general/scripts/aws/project_prepare.py | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index 1f3504e..f775e31 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -134,10 +134,18 @@ if __name__ == "__main__":
logging.info(json.dumps(project_conf))
if 'conf_additional_tags' in os.environ:
+ project_conf['shared_bucket_additional_tags'] = os.environ['conf_additional_tags'] + \
+ ';endpoint_tag:{};'.format(project_conf['endpoint_tag'])
+ project_conf['all_bucket_additional_tags'] = os.environ['conf_additional_tags'] + \
+ ';project_tag:{0};endpoint_tag:{1};'.format(
+ project_conf['project_tag'], project_conf['endpoint_tag'])
os.environ['conf_additional_tags'] = os.environ['conf_additional_tags'] + \
';project_tag:{0};endpoint_tag:{1};'.format(
project_conf['project_tag'], project_conf['endpoint_tag'])
else:
+ project_conf['shared_bucket_additional_tags'] = 'endpoint_tag:{};'.format(project_conf['endpoint_tag'])
+ project_conf['all_additional_tags'] = 'project_tag:{0};endpoint_tag:{1}'.format(project_conf['project_tag'],
+ project_conf['endpoint_tag'])
os.environ['conf_additional_tags'] = 'project_tag:{0};endpoint_tag:{1}'.format(project_conf['project_tag'],
project_conf['endpoint_tag'])
print('Additional tags will be added: {}'.format(os.environ['conf_additional_tags']))
@@ -531,6 +539,7 @@ if __name__ == "__main__":
try:
logging.info('[CREATE BUCKETS]')
print('[CREATE BUCKETS]')
+ os.environ['conf_additional_tags'] = project_conf['shared_bucket_additional_tags']
params = "--bucket_name {} --infra_tag_name {} --infra_tag_value {} --region {} --bucket_name_tag {}". \
format(project_conf['shared_bucket_name'], project_conf['tag_name'], project_conf['shared_bucket_name'], project_conf['region'], project_conf['shared_bucket_name_tag'])
try:
@@ -538,7 +547,7 @@ if __name__ == "__main__":
except:
traceback.print_exc()
raise Exception
-
+ os.environ['conf_additional_tags'] = project_conf['all_bucket_additional_tags']
params = "--bucket_name {} --infra_tag_name {} --infra_tag_value {} --region {} --bucket_name_tag {}" \
.format(project_conf['bucket_name'], project_conf['tag_name'], project_conf['bucket_name'],
project_conf['region'], project_conf['bucket_name_tag'])
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org