Skip to content

Commit b5c3378

Browse files
MarcinZablockiMarcinZablocki
authored
Merge pull request #28 from oci-hpc/dev
Merge current fixes from dev
2 parents a90a58f + ddd6849 commit b5c3378

File tree

14 files changed

+116
-60
lines changed

14 files changed

+116
-60
lines changed

‎autoscaling/create_cluster.sh‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,9 @@ cd $folder/clusters/$2
1313
if [[ $3 == VM.Standard.E3.* ]]
1414
then
1515
sed "s/##NODES##/$1/g;s/##NAME##/$2/g;s/##SHAPE##/VM.Standard.E3.Flex/g;s/##CN##/$4/g;s/##OCPU##/${3:15}/g" $folder/tf_init/variables.tf > variables.tf
16+
elif [[ $3 == VM.Optimized3.* ]]
17+
then
18+
sed "s/##NODES##/$1/g;s/##NAME##/$2/g;s/##SHAPE##/VM.Optimized3.Flex/g;s/##CN##/$4/g;s/##OCPU##/${3:15}/g" $folder/tf_init/variables.tf > variables.tf
1619
elif [[ $3 == VM.Standard.E4.* ]]
1720
then
1821
sed "s/##NODES##/$1/g;s/##NAME##/$2/g;s/##SHAPE##/VM.Standard.E4.Flex/g;s/##CN##/$4/g;s/##OCPU##/${3:15}/g" $folder/tf_init/variables.tf > variables.tf

‎autoscaling/tf_init/bastion_update.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ resource "local_file" "inventory" {
4343
cluster_mount_ip = local.mount_ip,
4444
cluster_name = local.cluster_name,
4545
shape = var.cluster_network ? var.cluster_network_shape : var.instance_pool_shape,
46-
instance_pool_ocpus=var.instance_pool_ocpus
46+
instance_pool_ocpus=var.instance_pool_ocpus,
47+
unsupported = var.unsupported
4748
})
4849
filename = "${local.bastion_path}/inventory"
4950
}

‎autoscaling/tf_init/locals.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ locals {
22
// display names of instances
33
cluster_instances_ids = var.cluster_network ? data.oci_core_instance.cluster_network_instances.*.id : data.oci_core_instance.instance_pool_instances.*.id
44
cluster_instances_names = var.cluster_network ? data.oci_core_instance.cluster_network_instances.*.display_name : data.oci_core_instance.instance_pool_instances.*.display_name
5-
5+
image_ocid = var.unsupported ? var.image_ocid : var.image
66
// ips of the instances
77
cluster_instances_ips = var.cluster_network ? data.oci_core_instance.cluster_network_instances.*.private_ip : data.oci_core_instance.instance_pool_instances.*.private_ip
88

@@ -14,14 +14,14 @@ locals {
1414

1515
cluster_name = var.use_custom_name ? var.cluster_name : random_pet.name.id
1616

17-
cluster_network_image = var.use_marketplace_image ? data.oci_core_app_catalog_listing_resource_versions.app_catalog_listing_resource_versions[0].app_catalog_listing_resource_versions[0].listing_resource_id : var.image
17+
cluster_network_image = var.use_marketplace_image ? oci_core_app_catalog_subscription.mp_image_subscription[0].listing_resource_id : local.image_ocid
1818

19-
instance_pool_image = ! var.cluster_network && var.use_marketplace_image ? data.oci_core_app_catalog_listing_resource_versions.app_catalog_listing_resource_versions[0].app_catalog_listing_resource_versions[0].listing_resource_id : var.image
19+
instance_pool_image = ! var.cluster_network && var.use_marketplace_image ? oci_core_app_catalog_subscription.mp_image_subscription[0].listing_resource_id : local.image_ocid
2020

2121
// image = (var.cluster_network && var.use_marketplace_image == true) || (var.cluster_network == false && var.use_marketplace_image == false) ? var.image : data.oci_core_images.linux.images.0.id
2222

2323
// is_bastion_flex_shape = var.bastion_shape == "VM.Standard.E3.Flex" ? [var.bastion_ocpus]:[]
24-
is_instance_pool_flex_shape = length(regexall(".*VM.*E[3-4].*Flex$", var.instance_pool_shape)) > 0 ? [var.instance_pool_ocpus]:[]
24+
is_instance_pool_flex_shape = length(regexall(".*VM.*[3-4].*Flex$", var.instance_pool_shape)) > 0 ? [var.instance_pool_ocpus]:[]
2525

2626
// bastion_mount_ip = var.bastion_block ? element(concat(oci_core_volume_attachment.bastion_volume_attachment.*.ipv4, [""]), 0) : "none"
2727

‎autoscaling/tf_init/marketplace.tf‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
locals {
2-
listing_number = split(".", var.marketplace_listing)[0]
3-
mp_listing_id = var.use_marketplace_image ? var.marketplace_listing_id[local.listing_number] : ""
2+
mp_listing_id = var.use_marketplace_image ? var.marketplace_listing_id : ""
3+
mp_version_id = split(".", var.marketplace_listing)[0]
44
}
55

66
/*
@@ -25,12 +25,11 @@ resource "oci_core_app_catalog_listing_resource_version_agreement" "mp_image_agr
2525
count = var.use_marketplace_image ? 1 : 0
2626

2727
listing_id = local.mp_listing_id
28-
listing_resource_version = data.oci_core_app_catalog_listing_resource_versions.app_catalog_listing_resource_versions[0].app_catalog_listing_resource_versions[0].listing_resource_version
29-
28+
listing_resource_version = var.marketplace_version_id[local.mp_version_id]
3029
}
3130

3231
resource "oci_core_app_catalog_subscription" "mp_image_subscription" {
33-
count = var.use_marketplace_image ? 1 : 0
32+
count = var.use_marketplace_image && var.node_count > 0 ? 1 : 0
3433
compartment_id = var.targetCompartment
3534
eula_link = oci_core_app_catalog_listing_resource_version_agreement.mp_image_agreement[0].eula_link
3635
listing_id = oci_core_app_catalog_listing_resource_version_agreement.mp_image_agreement[0].listing_id
@@ -43,4 +42,3 @@ resource "oci_core_app_catalog_subscription" "mp_image_subscription" {
4342
create = "20m"
4443
}
4544
}
46-

‎autoscaling/variables.tpl‎

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,24 @@ variable "spack" { default = ${spack} }
2727
variable "instance_pool_ocpus" { default = "##OCPU##"}
2828
variable "instance_pool_memory" { default = ${instance_pool_memory} }
2929
variable "instance_pool_custom_memory" { default = ${instance_pool_custom_memory} }
30-
variable "marketplace_listing" {
31-
/*
32-
Allowed values
33-
"1. Oracle Linux 7.8 OFED5.0"
34-
"2. Oracle Linux 7.5 OFED4.4"
35-
*/
36-
default = "${marketplace_listing}"
37-
}
3830

39-
variable "marketplace_listing_id" {
31+
variable "marketplace_listing" {
32+
default = "${marketplace_listing}"
33+
}
34+
35+
variable "marketplace_version_id" {
4036
type = map(string)
4137
default = {
42-
"1" = "ocid1.appcataloglisting.oc1..aaaaaaaahzcnanlki5vonyaeoiajjisejikzczygqqwheifymjqx3ft4iowa"
43-
"2" = "ocid1.appcataloglisting.oc1..aaaaaaaahz2xiwfcsbebmqg7sp6lhdt6r2vsjro5jfukkl5cntlqvfhkbzaq"
38+
"1" = "OL7.9-OFED5.3-1.0.0.1-RHCK-20210607"
39+
"2" = "OL7.8-OFED5.0-1.0.0.0-UEK-20200826"
40+
"3" = "OL7.7-OFED-4.4-2.0.7.0-UEK-20200229"
4441
}
4542
}
4643

44+
variable "marketplace_listing_id" {
45+
default = "ocid1.appcataloglisting.oc1..aaaaaaaahzcnanlki5vonyaeoiajjisejikzczygqqwheifymjqx3ft4iowa"
46+
}
47+
4748
variable "bastion_block_volume_performance" {
4849
/*
4950
Allowed values
@@ -76,4 +77,6 @@ variable "nfs_source_path" { default = "${nfs_source_path}"}
7677
variable "nfs_options" { default = "${nfs_options}"}
7778

7879
variable "hyperthreading" { default = ${hyperthreading} }
79-
Variable “ldap” { default = “${ldap}” }
80+
variable "unsupported" { default = ${unsupported} }
81+
variable "image_ocid" { default = "ocid1.image.oc1..aaaaaaaa5yxem7wzie34hi5km4qm2t754tsfxrjuefyjivebrxjad4jcj5oa" }
82+
variable "ldap" { default = ${ldap} }

‎bastion.tf‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -274,7 +274,8 @@ resource "null_resource" "cluster" {
274274
nfs_source_path = var.nfs_source_path,
275275
nfs_options = var.nfs_options,
276276
monitoring = var.monitoring,
277-
hyperthreading = var.hyperthreading
277+
hyperthreading = var.hyperthreading,
278+
unsupported = var.unsupported
278279
})
279280

280281
destination = "/home/${var.bastion_username}/autoscaling/tf_init/variables.tf"

‎cluster-network.tf‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,10 @@ resource "oci_core_cluster_network" "cluster_network" {
2626
size = var.node_count
2727
display_name = local.cluster_name
2828
}
29+
freeform_tags = {
30+
"cluster_name" = local.cluster_name
31+
"parent_cluster" = local.cluster_name
32+
}
2933
placement_configuration {
3034
availability_domain = var.ad
3135
primary_subnet_id = local.subnet_id

‎instance-pool.tf‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,10 @@ resource "oci_core_instance_pool" "instance_pool" {
2525
instance_configuration_id = oci_core_instance_configuration.instance_pool_configuration[0].id
2626
size = var.node_count
2727
display_name = local.cluster_name
28-
28+
freeform_tags = {
29+
"cluster_name" = local.cluster_name
30+
"parent_cluster" = local.cluster_name
31+
}
2932
placement_configurations {
3033
availability_domain = var.ad
3134
primary_subnet_id = local.subnet_id

‎locals.tf‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,14 +21,14 @@ locals {
2121

2222
cluster_name = var.use_custom_name ? var.cluster_name : random_pet.name.id
2323

24-
cluster_network_image = var.use_marketplace_image ? data.oci_core_app_catalog_listing_resource_versions.app_catalog_listing_resource_versions[0].app_catalog_listing_resource_versions[0].listing_resource_id : local.image_ocid
24+
cluster_network_image = var.use_marketplace_image ? oci_core_app_catalog_subscription.mp_image_subscription[0].listing_resource_id : local.image_ocid
2525

26-
instance_pool_image = ! var.cluster_network && var.use_marketplace_image ? data.oci_core_app_catalog_listing_resource_versions.app_catalog_listing_resource_versions[0].app_catalog_listing_resource_versions[0].listing_resource_id : local.image_ocid
26+
instance_pool_image = ! var.cluster_network && var.use_marketplace_image ? oci_core_app_catalog_subscription.mp_image_subscription[0].listing_resource_id : local.image_ocid
2727

2828
// image = (var.cluster_network && var.use_marketplace_image == true) || (var.cluster_network == false && var.use_marketplace_image == false) ? var.image : data.oci_core_images.linux.images.0.id
2929

30-
is_bastion_flex_shape = length(regexall(".*VM.*E[3-4].*Flex$", var.bastion_shape)) > 0 ? [var.bastion_ocpus]:[]
31-
is_instance_pool_flex_shape = length(regexall(".*VM.*E[3-4].*Flex$", var.instance_pool_shape)) > 0 ? [var.instance_pool_ocpus]:[]
30+
is_bastion_flex_shape = length(regexall(".*VM.*[3-4].*Flex$", var.bastion_shape)) > 0 ? [var.bastion_ocpus]:[]
31+
is_instance_pool_flex_shape = length(regexall(".*VM.*[3-4].*Flex$", var.instance_pool_shape)) > 0 ? [var.instance_pool_ocpus]:[]
3232

3333
bastion_mount_ip = var.bastion_block ? element(concat(oci_core_volume_attachment.bastion_volume_attachment.*.ipv4, [""]), 0) : "none"
3434

‎marketplace.tf‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
locals {
2-
listing_number = split(".", var.marketplace_listing)[0]
3-
mp_listing_id = var.use_marketplace_image ? var.marketplace_listing_id[local.listing_number] : ""
2+
// listing_number = split(".", var.marketplace_listing)[0]
3+
mp_listing_id = var.use_marketplace_image ? var.marketplace_listing_id : ""
4+
mp_version_id = split(".", var.marketplace_listing)[0]
45
}
56

67
/*
@@ -25,12 +26,12 @@ resource "oci_core_app_catalog_listing_resource_version_agreement" "mp_image_agr
2526
count = var.use_marketplace_image ? 1 : 0
2627

2728
listing_id = local.mp_listing_id
28-
listing_resource_version = data.oci_core_app_catalog_listing_resource_versions.app_catalog_listing_resource_versions[0].app_catalog_listing_resource_versions[0].listing_resource_version
29+
listing_resource_version = var.marketplace_version_id[local.mp_version_id]
2930

3031
}
3132

3233
resource "oci_core_app_catalog_subscription" "mp_image_subscription" {
33-
count = var.use_marketplace_image && var.node_count > 0 ? 1 : 0
34+
count = var.use_marketplace_image ? 1 : 0
3435
compartment_id = var.targetCompartment
3536
eula_link = oci_core_app_catalog_listing_resource_version_agreement.mp_image_agreement[0].eula_link
3637
listing_id = oci_core_app_catalog_listing_resource_version_agreement.mp_image_agreement[0].listing_id

0 commit comments

Comments
 (0)