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 <[email protected]> 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: [email protected] For additional commands, e-mail: [email protected]
