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 14:01:39 UTC
[incubator-dlab] branch DLAB-1531 updated (cbf4bf2 -> d03b40b)
This is an automated email from the ASF dual-hosted git repository.
lfrolov pushed a change to branch DLAB-1531
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git.
discard cbf4bf2 DLAB-1531 changed in code "Name" tag to SBN-tag
new d03b40b DLAB-1531 returned Name tag to azure service_account
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (cbf4bf2)
\
N -- N -- N refs/heads/DLAB-1531 (d03b40b)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 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/lib/azure/actions_lib.py | 5 ++--
.../scripts/azure/common_create_storage_account.py | 3 +-
.../scripts/azure/common_download_git_certfile.py | 3 +-
.../src/general/scripts/azure/edge_configure.py | 17 ++++++------
.../src/general/scripts/azure/edge_prepare.py | 11 ++++----
.../src/general/scripts/azure/project_prepare.py | 32 ++++++++++++----------
6 files changed, 34 insertions(+), 37 deletions(-)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@dlab.apache.org
For additional commands, e-mail: commits-help@dlab.apache.org
[incubator-dlab] 01/01: DLAB-1531 returned Name tag to azure
service_account
Posted by lf...@apache.org.
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 d03b40b4cfe19935bf571ff4e1ee6f7a0cbf9214
Author: leonidfrolov <fr...@gmail.com>
AuthorDate: Mon Feb 24 16:01:18 2020 +0200
DLAB-1531 returned Name tag to azure service_account
---
.../src/general/scripts/azure/project_prepare.py | 14 ++++++++------
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py b/infrastructure-provisioning/src/general/scripts/azure/project_prepare.py
index db1ad75..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'] = 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'
@@ -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,19 +91,21 @@ 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'] = {project_conf['tag_name']: project_conf['edge_storage_account_name'],
+ project_conf['storage_account_tags'] = {"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'],
- 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['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'])
project_conf['shared_container_name'] = '{}-{}-shared-container'.format(project_conf['service_base_name'], project_conf['endpoint_name']).lower()
- project_conf['shared_storage_account_tags'] = {project_conf['tag_name']: project_conf['shared_storage_account_name'],
+ 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_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