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 1cf6c14  [DLAB-1546]: added name convention changes
1cf6c14 is described below

commit 1cf6c14dae956a74069839267ce9e7e94a495471
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Mon Mar 2 13:00:54 2020 +0200

    [DLAB-1546]: added name convention changes
---
 .../src/general/scripts/gcp/ssn_configure.py                       | 2 --
 infrastructure-provisioning/terraform/aws/endpoint/main/network.tf | 2 +-
 infrastructure-provisioning/terraform/azure/endpoint/main/main.tf  | 7 ++++---
 .../terraform/azure/endpoint/main/network.tf                       | 2 +-
 4 files changed, 6 insertions(+), 7 deletions(-)

diff --git 
a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py 
b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
index 45f5cad..4ccf3e3 100644
--- a/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
+++ b/infrastructure-provisioning/src/general/scripts/gcp/ssn_configure.py
@@ -457,7 +457,6 @@ if __name__ == "__main__":
         print("Firewall Names: {}".format(ssn_conf['firewall_name']))
         print("SSN instance size: {}".format(ssn_conf['instance_size']))
         print("SSN AMI name: {}".format(ssn_conf['image_name']))
-        print("SSN bucket name: {}".format(ssn_conf['ssn_bucket_name']))
         print("Region: {}".format(ssn_conf['region']))
         jenkins_url = "http://{}/jenkins".format(ssn_conf['instance_hostname'])
         jenkins_url_https = 
"https://{}/jenkins".format(ssn_conf['instance_hostname'])
@@ -481,7 +480,6 @@ if __name__ == "__main__":
                    "subnet_id": ssn_conf['subnet_name'],
                    "security_id": ssn_conf['firewall_name'],
                    "instance_shape": ssn_conf['instance_size'],
-                   "bucket_name": ssn_conf['ssn_bucket_name'],
                    "shared_bucket_name": ssn_conf['shared_bucket_name'],
                    "region": ssn_conf['region'],
                    "action": "Create SSN instance"}
diff --git a/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf 
b/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
index fad5c57..661080f 100644
--- a/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/aws/endpoint/main/network.tf
@@ -22,7 +22,7 @@
 locals {
   endpoint_subnet_name       = 
"${var.service_base_name}-${var.endpoint_id}-subnet"
   endpoint_sg_name           = "${var.service_base_name}-${var.endpoint_id}-sg"
-  endpoint_vpc_name          = "${var.service_base_name}-endpoint-vpc"
+  endpoint_vpc_name          = 
"${var.service_base_name}-${var.endpoint_id}-vpc"
   additional_tag             = split(":", var.additional_tag)
   endpoint_igw_name          = 
"${var.service_base_name}-${var.endpoint_id}-igw"
   endpoint_ip_name           = 
"${var.service_base_name}-${var.endpoint_id}-static-ip"
diff --git a/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf 
b/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
index 5d832fa..2262c81 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/main.tf
@@ -20,7 +20,8 @@
 # 
******************************************************************************
 
 locals {
-  json_data = jsondecode(file(var.auth_file_path))
+  resource_group_name = 
"${var.service_base_name}-${var.endpoint_id}-resource-group"
+  json_data           = jsondecode(file(var.auth_file_path))
 }
 
 provider "azurerm" {
@@ -31,8 +32,8 @@ provider "azurerm" {
 }
 
 resource "azurerm_resource_group" "endpoint-resource-group" {
-  count  = var.resource_group_name == "" ? 1 : 0
-  name     = var.service_base_name
+  count    = var.resource_group_name == "" ? 1 : 0
+  name     = local.resource_group_name
   location = var.region
 
   tags = {
diff --git 
a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf 
b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
index e637bc7..dec5d6e 100644
--- a/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
+++ b/infrastructure-provisioning/terraform/azure/endpoint/main/network.tf
@@ -21,7 +21,7 @@
 
 locals {
   endpoint_subnet_name       = 
"${var.service_base_name}-${var.endpoint_id}-subnet"
-  endpoint_vpc_name          = "${var.service_base_name}-endpoint-vpc"
+  endpoint_vpc_name          = 
"${var.service_base_name}-${var.endpoint_id}-vpc"
   additional_tag             = split(":", var.additional_tag)
   endpoint_ip_name           = 
"${var.service_base_name}-${var.endpoint_id}-static-ip"
   endpoint_nif_name          = 
"${var.service_base_name}-${var.endpoint_id}-nif"


---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]

Reply via email to