Merge pull request #323 from ComputeCanada/bump9

Move to Rocky / Alma Linux 9 in examples
ComputeCanada · Sep 20, 2024 · 886f2bf · 886f2bf
2 parents e9523e0 + 931832b
commit 886f2bf
Show file tree

Hide file tree

Showing 12 changed files with 24 additions and 18 deletions.
diff --git a/examples/advanced/basic_puppet/openstack/main.tf b/examples/advanced/basic_puppet/openstack/main.tf
@@ -9,7 +9,7 @@ module "openstack" {
 
   cluster_name = "dev-puppet"
   domain       = "calculquebec.cloud"
-  image        = "Rocky-8.6-x64-2022-07"
+  image        = "Rocky-9"
 
   instances = {
     puppet = { type = "p4-7.5gb", tags = ["puppet"] }

diff --git a/examples/advanced/elk/openstack/main.tf b/examples/advanced/elk/openstack/main.tf
@@ -9,7 +9,7 @@ module "openstack" {
 
   cluster_name = "odfe-cluster"
   domain       = "computecanada.dev"
-  image        = "Rocky-8.6-x64-2022-07"
+  image        = "Rocky-9"
 
   instances = {
     puppet = { type = "p2-3.75gb", tags = ["puppet"] }

diff --git a/examples/advanced/k8s/openstack/main.tf b/examples/advanced/k8s/openstack/main.tf
@@ -9,7 +9,7 @@ module "openstack" {
 
   cluster_name = "k8s-os"
   domain       = "computecanada.dev"
-  image        = "Rocky-8.6-x64-2022-07"
+  image        = "Rocky-9"
 
   instances = {
     master   = { type = "c2-7.5gb-31", tags = ["controller", "puppet", "public"], count = 1 }

diff --git a/examples/advanced/lustre/openstack/main.tf b/examples/advanced/lustre/openstack/main.tf
@@ -9,7 +9,7 @@ module "openstack" {
 
   cluster_name = "lustre"
   domain       = "calculquebec.cloud"
-  image        = "Rocky-8.6-x64-2022-07"
+  image        = "Rocky-9"
 
   instances = {
     puppet = { type = "p4-7.5gb", tags = ["puppet"] }

diff --git a/examples/advanced/spark/openstack/main.tf b/examples/advanced/spark/openstack/main.tf
@@ -9,7 +9,7 @@ module "openstack" {
 
   cluster_name = "spark-test"
   domain       = "computecanada.dev"
-  image        = "Rocky-8.6-x64-2022-07"
+  image        = "Rocky-9"
 
   instances = {
     puppet = { type = "p2-3.75gb", tags = ["puppet"] }

diff --git a/examples/advanced/spot_instances/aws/main.tf b/examples/advanced/spot_instances/aws/main.tf
@@ -9,9 +9,9 @@ module "aws" {
 
   cluster_name = "spot-aws"
   domain       = "calculquebec.cloud"
-  # Rocky Linux 8 -  ca-central-1
-  # https://rockylinux.org/cloud-images
-  image        = "ami-09ada793eea1559e6"
+  # Rocky Linux 9.4 -  ca-central-1
+  # https://rockylinux.org/download
+  image        = "ami-07fbc9d69b1aa88b9"
 
   instances = {
     mgmt  = { type = "t3.large",  count = 1, tags = ["mgmt", "puppet", "nfs"] },

diff --git a/examples/advanced/spot_instances/azure/main.tf b/examples/advanced/spot_instances/azure/main.tf
@@ -9,10 +9,16 @@ module "azure" {
 
   cluster_name = "spot-azure"
   domain       = "calculquebec.cloud"
+
+  # Using the AZure CLI, you can list the image versions that are available to use. For example,
+  #   az vm image list --location eastus --publisher almalinux --offer almalinux-x86_64 --sku 9-gen2 --all --output table
+  #   az vm image list --location eastus --publisher almalinux --offer almalinux-arm --sku 9-arm-gen2 --all --output table
+  # (Note: available versions may be location specific!)
   image        = {
-    publisher = "OpenLogic",
-    offer     = "CentOS-CI",
-    sku       = "7-CI"
+    publisher = "almalinux",
+    offer     = "almalinux-x86_64",
+    sku       = "9-gen2",
+    version   = "9.3.2023111602"
   }
 
   instances = {

diff --git a/examples/advanced/spot_instances/gcp/main.tf b/examples/advanced/spot_instances/gcp/main.tf
@@ -9,7 +9,7 @@ module "gcp" {
 
   cluster_name = "spot-gcp"
   domain       = "calculquebec.cloud"
-  image        = "rocky-linux-8"
+  image        = "rocky-linux-9"
   nb_users     = 10
 
   instances = {

diff --git a/examples/aws/main.tf b/examples/aws/main.tf
@@ -14,9 +14,9 @@ module "aws" {
 
   cluster_name = "phoenix"
   domain       = "calculquebec.cloud"
-  # Rocky Linux 8 -  ca-central-1
-  # https://rockylinux.org/cloud-images
-  image        = "ami-09ada793eea1559e6"
+  # Rocky Linux 9.4 -  ca-central-1
+  # https://rockylinux.org/download
+  image        = "ami-07fbc9d69b1aa88b9"
 
   instances = {
     mgmt  = { type = "t3.large",  count = 1, tags = ["mgmt", "puppet", "nfs"] },

diff --git a/examples/gcp/main.tf b/examples/gcp/main.tf
@@ -14,7 +14,7 @@ module "gcp" {
 
   cluster_name = "phoenix"
   domain       = "calculquebec.cloud"
-  image        = "rocky-linux-8-optimized-gcp"
+  image        = "rocky-linux-9-optimized-gcp"
 
   instances = {
     mgmt   = { type = "n2-standard-2", tags = ["puppet", "mgmt", "nfs"], count = 1 }

diff --git a/examples/openstack/main.tf b/examples/openstack/main.tf
@@ -14,7 +14,7 @@ module "openstack" {
 
   cluster_name = "phoenix"
   domain       = "calculquebec.cloud"
-  image        = "Rocky-8"
+  image        = "Rocky-9"
 
   instances = {
     mgmt   = { type = "p4-6gb", tags = ["puppet", "mgmt", "nfs"], count = 1 }

diff --git a/examples/ovh/main.tf b/examples/ovh/main.tf
@@ -14,7 +14,7 @@ module "ovh" {
 
   cluster_name = "phoenix"
   domain       = "calculquebec.cloud"
-  image        = "Rocky Linux 8"
+  image        = "Rocky Linux 9"
 
   instances = {
     mgmt   = { type = "b2-7", tags = ["puppet", "mgmt", "nfs"], count = 1 }