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 11:28:10 UTC
[incubator-dlab] branch DLAB-1531 updated: DLAB-1531 changed some
variables
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
The following commit(s) were added to refs/heads/DLAB-1531 by this push:
new 1595440 DLAB-1531 changed some variables
1595440 is described below
commit 1595440c95dda417203845f2f5c342d072cc3ecc
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Thu Feb 20 13:27:53 2020 +0200
DLAB-1531 changed some variables
---
.../src/general/scripts/aws/project_prepare.py | 6 +++---
.../src/general/scripts/gcp/project_prepare.py | 18 +++++++++---------
2 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
index f775e31..f1faa34 100644
--- a/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/aws/project_prepare.py
@@ -136,7 +136,7 @@ if __name__ == "__main__":
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_conf['conf_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'] + \
@@ -144,7 +144,7 @@ if __name__ == "__main__":
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['conf_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'])
@@ -547,7 +547,7 @@ if __name__ == "__main__":
except:
traceback.print_exc()
raise Exception
- os.environ['conf_additional_tags'] = project_conf['all_bucket_additional_tags']
+ os.environ['conf_additional_tags'] = project_conf['conf_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'])
diff --git a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
index ede9991..130839b 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/project_prepare.py
@@ -367,10 +367,10 @@ if __name__ == "__main__":
logging.info('[CREATE BUCKETS]')
print('[CREATE BUCKETS]')
project_conf['shared_bucket_tags'] = {
- "name":project_conf['shared_bucket_name'],
- "endpoint_tag":project_conf['endpoint_tag'],
- "product":"dlab",
- "sbn":project_conf['service_base_name']}
+ "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']}
params = "--bucket_name {}".format(project_conf['shared_bucket_name'])
try:
local("~/scripts/{}.py {}".format('common_create_bucket', params))
@@ -381,11 +381,11 @@ if __name__ == "__main__":
params = "--bucket_name {}".format(project_conf['bucket_name'])
project_conf['bucket_tags'] = {
- "name":project_conf['bucket_name'],
- "endpoint_tag":project_conf['endpoint_tag'],
- "product":"dlab",
- "sbn":project_conf['service_base_name'],
- "project_tag":project_conf['project_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'],
+ "project_tag": project_conf['project_tag']}
try:
local("~/scripts/{}.py {}".format('common_create_bucket', params))
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org