Squash commit for 2.11.1.1

arnaudfroidmont · arnaudfroidmont · commit 8cb80a978884 · 2025-04-11T14:51:35.000-06:00
diff --git a/autoscaling/tf_init/cluster-network-configuration.tf b/autoscaling/tf_init/cluster-network-configuration.tf
@@ -9,8 +9,6 @@ resource "oci_core_instance_configuration" "cluster-network-instance_configurati
     launch_details {
       availability_domain = var.ad
       compartment_id      = var.targetCompartment
-      create_vnic_details {
-      }
       freeform_tags = {
         "cluster_name"   = local.cluster_name
         "parent_cluster" = local.cluster_name
diff --git a/autoscaling/tf_init/instance-pool-configuration.tf b/autoscaling/tf_init/instance-pool-configuration.tf
@@ -9,8 +9,6 @@ resource "oci_core_instance_configuration" "instance_pool_configuration" {
     launch_details {
       availability_domain = var.ad
       compartment_id      = var.targetCompartment
-      create_vnic_details {
-      }
       freeform_tags = {
         "cluster_name"   = local.cluster_name
         "parent_cluster" = local.cluster_name
diff --git a/cluster-network-configuration.tf b/cluster-network-configuration.tf
@@ -9,8 +9,6 @@ resource "oci_core_instance_configuration" "cluster-network-instance_configurati
     launch_details {
       availability_domain = var.ad
       compartment_id      = var.targetCompartment
-      create_vnic_details {
-      }
       display_name = local.cluster_name
       freeform_tags = {
         "cluster_name"   = local.cluster_name
diff --git a/compute-nodes.tf b/compute-nodes.tf
@@ -66,7 +66,7 @@ resource "oci_core_instance" "compute_cluster_instances" {
   }
 
   metadata = {
-    ssh_authorized_keys = "${var.ssh_key}\n${tls_private_key.ssh.public_key_openssh}"
+    ssh_authorized_keys = var.compute_node_ssh_key == "" ? "${var.ssh_key}\n${tls_private_key.ssh.public_key_openssh}" : "${var.ssh_key}\n${tls_private_key.ssh.public_key_openssh}${var.compute_node_ssh_key}\n"
     user_data           = base64encode(data.template_file.controller_config.rendered)
   }
   source_details {
diff --git a/instance-pool-configuration.tf b/instance-pool-configuration.tf
@@ -9,8 +9,6 @@ resource "oci_core_instance_configuration" "instance_pool_configuration" {
     launch_details {
       availability_domain = var.ad
       compartment_id      = var.targetCompartment
-      create_vnic_details {
-      }
       display_name = local.cluster_name
       freeform_tags = {
         "cluster_name"   = local.cluster_name
diff --git a/playbooks/roles/firewall/tasks/ubuntu.yml b/playbooks/roles/firewall/tasks/ubuntu.yml
@@ -5,6 +5,7 @@
     name: ufw
     state: stopped
     enabled: no
+  ignore_errors: true
 
 # it still need update to iptables rules to accept traffic or else mpi traffic fails 
 
diff --git a/playbooks/roles/hyperthreading/files/disable-hyperthreading.service b/playbooks/roles/hyperthreading/files/disable-hyperthreading.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Start this service to disable Hyperthreading, stop it to enable Hyperthreading.
-After=syslog.target irqbalance.service
+After=syslog.target irqbalance.service tuned.service
 
 [Service]
 Type=oneshot
diff --git a/playbooks/roles/hyperthreading/files/disable-hyperthreading_ubuntu.service b/playbooks/roles/hyperthreading/files/disable-hyperthreading_ubuntu.service
@@ -1,6 +1,6 @@
 [Unit]
 Description=Start this service to disable Hyperthreading, stop it to enable Hyperthreading.
-After=syslog.target irqbalance.service
+After=syslog.target irqbalance.service tuned.service
 
 [Service]
 Type=oneshot
diff --git a/playbooks/roles/hyperthreading/tasks/el.yml b/playbooks/roles/hyperthreading/tasks/el.yml
@@ -29,7 +29,7 @@
   ansible.builtin.systemd:
     daemon_reload: yes
 
-- name: 
+- name: Start HT service
   ansible.builtin.systemd:
     name: disable-hyperthreading.service
     state: started
diff --git a/playbooks/roles/hyperthreading/tasks/ubuntu.yml b/playbooks/roles/hyperthreading/tasks/ubuntu.yml
@@ -29,7 +29,7 @@
   ansible.builtin.systemd:
     daemon_reload: yes
 
-- name: 
+- name: Start HT service
   ansible.builtin.systemd:
     name: disable-hyperthreading_ubuntu.service
     state: started

Original file line number	Diff line number	Diff line change
`@@ -66,7 +66,7 @@ resource "oci_core_instance" "compute_cluster_instances" {`
`66`	`66`	`}`
`67`	`67`
`68`	`68`	`metadata = {`
`69`		`- ssh_authorized_keys = "${var.ssh_key}\n${tls_private_key.ssh.public_key_openssh}"`
	`69`	`+ ssh_authorized_keys = var.compute_node_ssh_key == "" ? "${var.ssh_key}\n${tls_private_key.ssh.public_key_openssh}" : "${var.ssh_key}\n${tls_private_key.ssh.public_key_openssh}${var.compute_node_ssh_key}\n"`
`70`	`70`	`user_data = base64encode(data.template_file.controller_config.rendered)`
`71`	`71`	`}`
`72`	`72`	`source_details {`