Skip to content

add gen1 and gen2 launch logic for Azure VMs #397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alexxa wants to merge 1 commit into
base: main
Choose a base branch
from
Open

add gen1 and gen2 launch logic for Azure VMs #397

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 24 additions & 8 deletions cloud/opentofu/azure_config_builder_v2.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,10 @@ class AzureConfigBuilderV2(BaseConfigBuilder):
"azurerm": {"source": "hashicorp/azurerm", "version": f"~> {provider_version}"}
}

default_x86_vm_size = 'Standard_DS1_v2'
default_x86_vm_size = {
"gen1": "Standard_DS1_v2",
"gen2": "Standard_B2ms"
}
default_arm64_vm_size = 'Standard_D2pls_v5'
default_hyper_v_generation = 'V2'
default_admin_username = 'azure'
Expand Down Expand Up @@ -86,8 +89,6 @@ def build_resources(self):
self.__new_azure_shared_image(instance)
self.__new_azure_shared_image_version(instance)

self.__new_azure_public_ip(instance)
self.__new_azure_nic(instance)
self.__new_azure_vm(instance)

if not self.resources_tf['resource']['azurerm_shared_image_gallery']:
Expand Down Expand Up @@ -218,8 +219,9 @@ def __new_azure_subnet(self, instance):

self.resources_tf['resource']['azurerm_subnet'][name] = new_subnet

def __new_azure_public_ip(self, instance):
name = self.create_resource_name([instance['hostname'], 'public-ip'])
def __new_azure_public_ip(self, instance, gen_suffix=None):
suffix = f"-{gen_suffix}" if gen_suffix else ""
name = self.create_resource_name([instance['hostname'], 'public-ip']) + suffix
instance['azurerm_public_ip'] = name

new_public_ip = {
Expand All @@ -233,8 +235,9 @@ def __new_azure_public_ip(self, instance):

self.resources_tf['resource']['azurerm_public_ip'][name] = new_public_ip

def __new_azure_nic(self, instance):
name = self.create_resource_name([instance['hostname'], 'nic'])
def __new_azure_nic(self, instance, gen_suffix=None):
suffix = f"-{gen_suffix}" if gen_suffix else ""
name = self.create_resource_name([instance['hostname'], 'nic']) + suffix
instance['azurerm_network_interface'] = name

ip_configuration = {
Expand Down Expand Up @@ -273,7 +276,20 @@ def __new_azure_vm(self, instance):
if instance['arch'] == 'Arm64':
instance['instance_type'] = self.default_arm64_vm_size
else:
instance['instance_type'] = self.default_x86_vm_size

for gen, vm_size in self.default_x86_vm_size.items():
temp_instance = instance.copy()
temp_instance['instance_type'] = vm_size
temp_instance['hostname'] = self.create_resource_name([instance['hostname'], gen])
self.__new_azure_public_ip(temp_instance, gen)
self.__new_azure_nic(temp_instance, gen)
self.__create_single_vm(temp_instance)
else:
self.__new_azure_public_ip(instance)
self.__new_azure_nic(instance)
self.__create_single_vm(instance)

def __create_single_vm(self, instance):

instance_hostname = instance['hostname']

Expand Down