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 bbea296 [DLAB-1546]: added name convention changes
bbea296 is described below
commit bbea296d614f52518d4e0181973fe1827bfa80dd
Author: Oleh Martushevskyi <[email protected]>
AuthorDate: Mon Mar 2 15:46:14 2020 +0200
[DLAB-1546]: added name convention changes
---
.../src/general/lib/azure/actions_lib.py | 20 +++++++++++---------
.../general/scripts/azure/common_create_instance.py | 2 +-
.../src/general/scripts/azure/edge_prepare.py | 2 +-
.../modules/data_engine/instance.tf | 4 ++--
.../modules/notebook/instance.tf | 4 ++--
.../terraform/azure/project/main/instance.tf | 2 +-
6 files changed, 18 insertions(+), 16 deletions(-)
diff --git a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
index 28da762..8cac3c4 100644
--- a/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
+++ b/infrastructure-provisioning/src/general/lib/azure/actions_lib.py
@@ -521,7 +521,7 @@ class AzureActions:
},
'os_disk': {
'os_type': 'Linux',
- 'name': '{}-ssn-disk0'.format(service_base_name),
+ 'name':
'{}-ssn-volume-primary'.format(service_base_name),
'create_option': 'fromImage',
'disk_size_gb': int(primary_disk_size),
'tags': tags,
@@ -568,7 +568,8 @@ class AzureActions:
},
'os_disk': {
'os_type': 'Linux',
- 'name':
'{}-{}-edge-disk0'.format(service_base_name, project_name),
+ 'name':
'{}-{}-{}-edge-volume-primary'.format(service_base_name, project_name,
+
os.environ['endpoint_name'].lower()),
'create_option': create_option,
'disk_size_gb': int(primary_disk_size),
'tags': tags,
@@ -608,7 +609,8 @@ class AzureActions:
'storage_profile': {
'os_disk': {
'os_type': 'Linux',
- 'name':
'{}-{}-edge-disk0'.format(service_base_name, project_name),
+ 'name':
'{}-{}-{}-edge-volume-primary'.format(service_base_name, project_name,
+
os.environ['endpoint_name'].lower()),
'create_option': create_option,
'disk_size_gb': int(primary_disk_size),
'tags': tags,
@@ -637,7 +639,7 @@ class AzureActions:
},
'os_disk': {
'os_type': 'Linux',
- 'name': '{}-disk0'.format(instance_name),
+ 'name': '{}-volume-primary'.format(instance_name),
'create_option': 'fromImage',
'disk_size_gb': int(primary_disk_size),
'tags': tags,
@@ -648,11 +650,11 @@ class AzureActions:
'data_disks': [
{
'lun': 1,
- 'name': '{}-disk1'.format(instance_name),
+ 'name':
'{}-volume-secondary'.format(instance_name),
'create_option': 'empty',
'disk_size_gb': 32,
'tags': {
- 'Name': '{}-disk1'.format(instance_name)
+ 'Name':
'{}-volume-secondary'.format(instance_name)
},
'managed_disk': {
'storage_account_type':
instance_storage_account_type
@@ -667,7 +669,7 @@ class AzureActions:
},
'os_disk': {
'os_type': 'Linux',
- 'name': '{}-disk0'.format(instance_name),
+ 'name': '{}-volume-primary'.format(instance_name),
'create_option': 'fromImage',
'disk_size_gb': int(primary_disk_size),
'tags': tags,
@@ -712,7 +714,7 @@ class AzureActions:
},
'os_disk': {
'os_type': 'Linux',
- 'name': '{}-disk0'.format(instance_name),
+ 'name': '{}-volume-primary'.format(instance_name),
'create_option': 'fromImage',
'disk_size_gb': int(primary_disk_size),
'tags': tags,
@@ -731,7 +733,7 @@ class AzureActions:
},
'os_disk': {
'os_type': 'Linux',
- 'name': '{}-disk0'.format(instance_name),
+ 'name': '{}-volume-primary'.format(instance_name),
'create_option': 'fromImage',
'disk_size_gb': int(primary_disk_size),
'tags': tags,
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/common_create_instance.py
b/infrastructure-provisioning/src/general/scripts/azure/common_create_instance.py
index cb7073a..295e191 100644
---
a/infrastructure-provisioning/src/general/scripts/azure/common_create_instance.py
+++
b/infrastructure-provisioning/src/general/scripts/azure/common_create_instance.py
@@ -82,7 +82,7 @@ if __name__ == "__main__":
args.security_group_name,
json.loads(args.tags),
args.public_ip_name)
- disk = AzureMeta().get_disk(args.resource_group_name,
'{}-disk0'.format(
+ disk = AzureMeta().get_disk(args.resource_group_name,
'{}-volume-primary'.format(
args.instance_name))
if disk:
create_option = 'attach'
diff --git
a/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
b/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
index 9866d20..9dc1b01 100644
--- a/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
+++ b/infrastructure-provisioning/src/general/scripts/azure/edge_prepare.py
@@ -59,7 +59,7 @@ if __name__ == "__main__":
edge_conf['vpc_cidr'] = os.environ['conf_vpc_cidr']
edge_conf['private_subnet_prefix'] =
os.environ['conf_private_subnet_prefix']
edge_conf['instance_name'] = edge_conf['service_base_name'] + "-" +
edge_conf['user_name'] + '-edge'
- edge_conf['primary_disk_name'] = edge_conf['instance_name'] + '-disk0'
+ edge_conf['primary_disk_name'] = edge_conf['instance_name'] +
'-volume-primary'
edge_conf['edge_security_group_name'] = edge_conf['instance_name'] +
'-sg'
edge_conf['notebook_security_group_name'] =
edge_conf['service_base_name'] + "-" + edge_conf['user_name'] + "-" +
os.environ['endpoint_name']\
+ '-nb-sg'
diff --git
a/infrastructure-provisioning/terraform/azure/computational_resources/modules/data_engine/instance.tf
b/infrastructure-provisioning/terraform/azure/computational_resources/modules/data_engine/instance.tf
index 470e474..d76a16c 100644
---
a/infrastructure-provisioning/terraform/azure/computational_resources/modules/data_engine/instance.tf
+++
b/infrastructure-provisioning/terraform/azure/computational_resources/modules/data_engine/instance.tf
@@ -57,7 +57,7 @@ resource "azurerm_virtual_machine" "master" {
vm_size = var.master_shape
storage_os_disk {
- name = "${local.cluster_name}-m-disk0"
+ name = "${local.cluster_name}-m-volume-primary"
caching = "ReadWrite"
create_option = "FromImage"
managed_disk_type = "Premium_LRS"
@@ -129,7 +129,7 @@ resource "azurerm_virtual_machine" "slave" {
vm_size = var.slave_shape
storage_os_disk {
- name = "${local.notebook_name}-s-${count.index + 1}-disk0"
+ name = "${local.notebook_name}-s-${count.index +
1}-volume-primary"
caching = "ReadWrite"
create_option = "FromImage"
managed_disk_type = "Premium_LRS"
diff --git
a/infrastructure-provisioning/terraform/azure/computational_resources/modules/notebook/instance.tf
b/infrastructure-provisioning/terraform/azure/computational_resources/modules/notebook/instance.tf
index 0283038..70e1db5 100644
---
a/infrastructure-provisioning/terraform/azure/computational_resources/modules/notebook/instance.tf
+++
b/infrastructure-provisioning/terraform/azure/computational_resources/modules/notebook/instance.tf
@@ -58,7 +58,7 @@ resource "azurerm_virtual_machine" "instance" {
vm_size = var.instance_type
storage_os_disk {
- name = "${local.node_name}-disk0"
+ name = "${local.node_name}-volume-primary"
caching = "ReadWrite"
create_option = "FromImage"
managed_disk_type = "Premium_LRS"
@@ -106,7 +106,7 @@ resource "azurerm_virtual_machine" "instance_custom" {
vm_size = var.instance_type
storage_os_disk {
- name = "${local.node_name}-disk0"
+ name = "${local.node_name}-volume-primary"
caching = "ReadWrite"
create_option = "FromImage"
managed_disk_type = "Premium_LRS"
diff --git
a/infrastructure-provisioning/terraform/azure/project/main/instance.tf
b/infrastructure-provisioning/terraform/azure/project/main/instance.tf
index d7ec3aa..34cd26b 100644
--- a/infrastructure-provisioning/terraform/azure/project/main/instance.tf
+++ b/infrastructure-provisioning/terraform/azure/project/main/instance.tf
@@ -59,7 +59,7 @@ resource "azurerm_virtual_machine" "instance" {
vm_size = var.instance_type
storage_os_disk {
- name = "${local.node_name}-disk0"
+ name = "${local.node_name}-volume-primary"
caching = "ReadWrite"
create_option = "FromImage"
managed_disk_type = "Premium_LRS"
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]