This is an automated email from the ASF dual-hosted git repository.
omartushevskyi pushed a commit to branch DLAB-1546
in repository https://gitbox.apache.org/repos/asf/incubator-dlab.git
The following commit(s) were added to refs/heads/DLAB-1546 by this push:
new 1910739 [DLAB-1546]: added name convention changes
1910739 is described below
commit 191073965e99e468abc7b4914181badc07f60f46
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Wed Mar 4 17:40:00 2020 +0200
[DLAB-1546]: added name convention changes
---
.../terraform/azure/endpoint/main/outputs.tf | 8 ++++++++
infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py | 3 ++-
2 files changed, 10 insertions(+), 1 deletion(-)
diff --git
a/infrastructure-provisioning/terraform/azure/endpoint/main/outputs.tf
b/infrastructure-provisioning/terraform/azure/endpoint/main/outputs.tf
index 793917d..c005b29 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/outputs.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/outputs.tf
@@ -33,4 +33,12 @@ output "vpc_id" {
output "ssn_k8s_sg_id" {
value = azurerm_network_security_group.enpoint-sg.name
+}
+
+output "endpoint_id" {
+ value = var.endpoint_id
+}
+
+output "resource_group_name" {
+ value = data.azurerm_resource_group.data-endpoint-resource-group.name
}
\ No newline at end of file
diff --git a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
index 7bbcc79..814cad8 100644
--- a/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
+++ b/infrastructure-provisioning/terraform/bin/deploy/endpoint_fab.py
@@ -320,7 +320,7 @@ def
configure_supervisor_endpoint(endpoint_keystore_password):
conn.put('./provisioning.yml', '{}provisioning.yml'
.format(dlab_conf_dir))
if args.resource_group_name == '':
- args.resource_group_name =
'{}-resource-group'.format(args.service_base_name)
+ args.resource_group_name =
'{}-{}-resource-group'.format(args.service_base_name, args.endpoint_id)
if args.cloud_provider == 'azure':
args.region = args.region.lower().replace(' ', '')
cloud_properties = [
@@ -654,6 +654,7 @@ def init_args():
parser.add_argument('--dlab_path', type=str, default='/opt/dlab')
parser.add_argument('--key_name', type=str, default='', help='Name of
admin key without .pem extension')
parser.add_argument('--endpoint_eip_address', type=str)
+ parser.add_argument('--endpoint_id', type=str, default='')
parser.add_argument('--pkey', type=str, default='')
parser.add_argument('--hostname', type=str, default='')
parser.add_argument('--os_user', type=str, default='dlab-user')
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]