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/24 12:47:43 UTC
[incubator-dlab] branch DLAB-1581 updated (3b18859 -> d9a1c49)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1581
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
from 3b18859 DLAB-1531 changed one of gcp bucket tags
new 431f1e0 DLAB-1531 added sbn-tag for azure storage accounts
new d9a1c49 DLAB-1531 fixed some errors
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 | 8 +++++---
1 file changed, 5 insertions(+), 3 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 added sbn-tag for azure storage
accounts
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1581
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit 431f1e01b9d4b4e5c6187a766a4e2e27502a20e1
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Feb 24 14:27:39 2020 +0200
DLAB-1531 added sbn-tag for azure storage accounts
---
.../src/general/scripts/azure/project_prepare.py | 8 +++++---
1 file changed, 5 insertions(+), 3 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..a79f9e5 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -49,7 +49,7 @@ if __name__ == "__main__":
project_conf['azure_ad_user_name'] = os.environ['azure_iam_user']
project_conf['key_name'] = os.environ['conf_key_name']
-
+ project_conf['tag_name'] = notebook_config['service_base_name'] + '-tag'
project_conf['vpc_name'] = os.environ['azure_vpc_name']
project_conf['subnet_name'] = os.environ['azure_subnet_name']
project_conf['private_subnet_name'] = project_conf['service_base_name'] + '-' + project_conf['project_name'] + '-subnet'
@@ -95,7 +95,8 @@ if __name__ == "__main__":
"SBN": project_conf['service_base_name'],
"project_tag": project_conf['project_tag'],
"endpoint_tag": project_conf['endpoint_tag'],
- os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value']}
+ os.environ['conf_billing_tag_key']: os.environ['conf_billing_tag_value'],
+ project_conf['tag_name']: project_conf['shared_bucket_name']}
project_conf['primary_disk_size'] = '32'
project_conf['shared_storage_account_name'] = '{0}-{1}-shared-storage'.format(project_conf['service_base_name'],
project_conf['endpoint_name'])
@@ -103,7 +104,8 @@ if __name__ == "__main__":
project_conf['shared_storage_account_tags'] = {"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'],}
+ 'conf_billing_tag_value'], "endpoint_tag": project_conf['endpoint_tag'],
+ project_conf['tag_name']: project_conf['shared_bucket_name']}
# FUSE in case of absence of user's key
try:
---------------------------------------------------------------------
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 fixed some errors
Posted by lf...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a commit to branch DLAB-1581
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
commit d9a1c4998f846e2c8e9d7f4f194f910b1c0b3201
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Feb 24 14:39:48 2020 +0200
DLAB-1531 fixed some errors
---
.../src/general/scripts/azure/project_prepare.py | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index a79f9e5..f5c98ab 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
@@ -49,7 +49,7 @@ if __name__ == "__main__":
project_conf['azure_ad_user_name'] = os.environ['azure_iam_user']
project_conf['key_name'] = os.environ['conf_key_name']
- project_conf['tag_name'] = notebook_config['service_base_name'] + '-tag'
+ project_conf['tag_name'] = project_conf['service_base_name'] + '-tag'
project_conf['vpc_name'] = os.environ['azure_vpc_name']
project_conf['subnet_name'] = os.environ['azure_subnet_name']
project_conf['private_subnet_name'] = project_conf['service_base_name'] + '-' + project_conf['project_name'] + '-subnet'
@@ -96,7 +96,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['tag_name']: project_conf['shared_bucket_name']}
+ project_conf['tag_name']: project_conf['edge_storage_account_name']}
project_conf['primary_disk_size'] = '32'
project_conf['shared_storage_account_name'] = '{0}-{1}-shared-storage'.format(project_conf['service_base_name'],
project_conf['endpoint_name'])
@@ -105,7 +105,7 @@ if __name__ == "__main__":
"SBN": project_conf['service_base_name'],
os.environ['conf_billing_tag_key']: os.environ[
'conf_billing_tag_value'], "endpoint_tag": project_conf['endpoint_tag'],
- project_conf['tag_name']: project_conf['shared_bucket_name']}
+ project_conf['tag_name']: project_conf['shared_storage_account_name']}
# FUSE in case of absence of user's key
try:
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org