Fix things up for baremetal with the last known working image

See: coreos/fedora-coreos-tracker#746
stackhpc · Feb 13, 2021 · ac63a98 · ac63a98
1 parent 3128408
commit ac63a98
Show file tree

Hide file tree

Showing 8 changed files with 39 additions and 26 deletions.
diff --git a/main.tf b/main.tf
@@ -32,14 +32,16 @@ resource "openstack_containerinfra_clustertemplate_v1" "templates" {
   tls_disabled          = var.tls_disabled
   network_driver        = each.value.network_driver
   image                 = each.value.image
-  flavor                = var.flavor_name
-  master_flavor         = var.master_flavor_name
+  flavor                = lookup(each.value, "flavor", var.flavor)
+  master_flavor         = lookup(each.value, "master_flavor", var.master_flavor)
   volume_driver         = var.volume_driver
   external_network_id   = var.external_network
   master_lb_enabled     = var.master_lb_enabled
   fixed_network         = var.fixed_network
   fixed_subnet          = var.fixed_subnet
   insecure_registry     = var.insecure_registry
+  floating_ip_enabled   = var.floating_ip_enabled
+  docker_volume_size    = var.docker_volume_size
   labels                = merge(var.template_labels, lookup(each.value, "labels", {}))
 
   lifecycle {
@@ -55,9 +57,10 @@ resource "openstack_containerinfra_cluster_v1" "clusters" {
   node_count          = var.node_count
   keypair             = openstack_compute_keypair_v2.keypair.id
   create_timeout      = var.create_timeout
-  labels              = merge(var.template_labels, var.cluster_labels, lookup(each.value, "labels", {}))
-  docker_volume_size  = var.docker_volume_size
   floating_ip_enabled = var.floating_ip_enabled
+  flavor              = lookup(each.value, "flavor", var.flavor)
+  master_flavor       = lookup(each.value, "master_flavor", var.master_flavor)
+  labels              = merge(var.template_labels, var.cluster_labels, lookup(each.value, "labels", {}))
 }
 
 resource "local_file" "kubeconfigs" {

diff --git a/scripts/destroy.sh b/scripts/destroy.sh
@@ -1 +1 @@
-./cluster.sh "$1" "$2" "destroy -auto-approve"
+`dirname $0`/cluster.sh "$1" "$2" "destroy -auto-approve"
diff --git a/tfvars/alaska.tfvars b/tfvars/alaska.tfvars
@@ -1,14 +1,16 @@
 external_network    = "ilab"
-keypair_name        = "wendy"
+keypair_name        = "default"
 master_count        = 1
 node_count          = 1
 fixed_network       = "p3-internal"
 fixed_subnet        = "p3-internal"
-master_flavor_name  = "general.v1.tiny"
-flavor_name         = "compute-A"
+master_flavor  = "general.v1.tiny"
+flavor         = "compute-A"
 floating_ip_enabled = true
+master_lb_enabled   = false
 volume_driver       = ""
 insecure_registry   = "10.60.253.37"
+create_timeout      = 60
 template_labels = {
   container_infra_prefix        = "10.60.253.37/magnum/"
   monitoring_enabled            = "true"
@@ -19,3 +21,11 @@ template_labels = {
   ingress_controller            = "nginx"
   master_lb_floating_ip_enabled = "true"
 }
+kubeconfig = "k8s-alaska"
+clusters = {
+  "k8s-alaska" = {
+    template = "k8s-1.18.15"
+    labels = {
+    }
+  }
+}
diff --git a/tfvars/cumulus.tfvars b/tfvars/cumulus.tfvars
@@ -1,4 +1,4 @@
 external_network   = "internet"
-master_flavor_name = "general.v1.tiny"
-flavor_name        = "general.v1.tiny"
+master_flavor = "general.v1.tiny"
+flavor        = "general.v1.tiny"
 keypair_name       = "default"
diff --git a/tfvars/flannel.tfvars b/tfvars/flannel.tfvars
@@ -1,23 +1,23 @@
 templates = {
   "k8s-1.18.15" = {
     network_driver = "flannel"
-    image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+    image          = "fedora-coreos-32.20201018.3.0-openstack.x86_64"
     labels = {
       kube_tag           = "v1.18.15-rancher1"
       cloud_provider_tag = "v1.18.0"
     }
   }
   "k8s-1.19.7" = {
     network_driver = "flannel"
-    image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+    image          = "fedora-coreos-32.20201018.3.0-openstack.x86_64"
     labels = {
       kube_tag           = "v1.19.7-rancher1"
       cloud_provider_tag = "v1.19.0"
     }
   }
   "k8s-1.20.2" = {
     network_driver = "flannel"
-    image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+    image          = "fedora-coreos-32.20201018.3.0-openstack.x86_64"
     labels = {
       kube_tag           = "v1.20.2-rancher1"
       cloud_provider_tag = "v1.20.0"

diff --git a/tfvars/kayobe-all-in-one-overcloud.tfvars b/tfvars/kayobe-all-in-one-overcloud.tfvars
@@ -1,7 +1,7 @@
 external_network    = "public"
 keypair_name        = "default"
-master_flavor_name  = "m1.small"
-flavor_name         = "m1.medium"
+master_flavor  = "m1.small"
+flavor         = "m1.medium"
 volume_driver       = ""
 master_lb_enabled   = "false"
 floating_ip_enabled = "true"

diff --git a/tfvars/sausage.tfvars b/tfvars/sausage.tfvars
@@ -1,7 +1,7 @@
 external_network    = "internet"
 keypair_name        = "macbook"
-master_flavor_name  = "bratwurst"
-flavor_name         = "bratwurst"
+master_flavor  = "bratwurst"
+flavor         = "bratwurst"
 volume_driver       = ""
 floating_ip_enabled = false
 master_count        = 1

diff --git a/vars.tf b/vars.tf
@@ -3,26 +3,26 @@ variable "templates" {
   default = {
     "k8s-1.18.15" = {
       network_driver = "calico"
-      image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+      image          = "fedora-coreos-32.20201018.3.0-openstack.x86_64"
       labels = {
         kube_tag           = "v1.18.15-rancher1" # https://github.com/kubernetes/kubernetes/releases
         cloud_provider_tag = "v1.18.0"           # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
       }
     }
     "k8s-1.19.7" = {
       network_driver = "calico"
-      image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+      image          = "fedora-coreos-32.20201018.3.0-openstack.x86_64"
       labels = {
-        kube_tag           = "v1.19.7-rancher1"  # https://github.com/kubernetes/kubernetes/releases
-        cloud_provider_tag = "v1.19.0"           # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
+        kube_tag           = "v1.19.7-rancher1" # https://github.com/kubernetes/kubernetes/releases
+        cloud_provider_tag = "v1.19.0"          # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
       }
     }
     "k8s-1.20.2" = {
       network_driver = "calico"
-      image          = "fedora-coreos-33.20210117.3.2-openstack.x86_64"
+      image          = "fedora-coreos-32.20201018.3.0-openstack.x86_64"
       labels = {
-        kube_tag           = "v1.20.2-rancher1"  # https://github.com/kubernetes/kubernetes/releases
-        cloud_provider_tag = "v1.20.0"           # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
+        kube_tag           = "v1.20.2-rancher1" # https://github.com/kubernetes/kubernetes/releases
+        cloud_provider_tag = "v1.20.0"          # https://hub.docker.com/r/k8scloudprovider/openstack-cloud-controller-manager/tags
       }
     }
   }
@@ -56,12 +56,12 @@ variable "keypair_name" {
   type = string
 }
 
-variable "flavor_name" {
+variable "flavor" {
   type    = string
   default = "ds4G"
 }
 
-variable "master_flavor_name" {
+variable "master_flavor" {
   type    = string
   default = "ds4G"
 }