From 7f5f7e8a2296325f5e47702c07f79a08b0e5c490 Mon Sep 17 00:00:00 2001
From: Rob Kooper <kooper@illinois.edu>
Date: Thu, 22 Feb 2024 22:14:57 -0600
Subject: [PATCH] Update variables.tf
---
terraform/modules/rke1/variables.tf | 120 ++++------------------------
1 file changed, 16 insertions(+), 104 deletions(-)
diff --git a/terraform/modules/rke1/variables.tf b/terraform/modules/rke1/variables.tf
index 2aac442..3ef56a6 100644
--- a/terraform/modules/rke1/variables.tf
+++ b/terraform/modules/rke1/variables.tf
@@ -24,31 +24,6 @@ variable "cluster_machines" {
default = []
}
-# ----------------------------------------------------------------------
-# APPLICATIONS
-# ----------------------------------------------------------------------
-
-# DEPRECATED - will move to argocd
-variable "monitoring_enabled" {
- type = bool
- description = "Enable monitoring in rancher"
- default = true
-}
-
-# DEPRECATED - will move to argocd
-variable "longhorn_enabled" {
- type = bool
- description = "Enable longhorn storage"
- default = true
-}
-
-# DEPRECATED - will move to argocd
-variable "longhorn_replicas" {
- type = string
- description = "Number of replicas"
- default = 3
-}
-
# ----------------------------------------------------------------------
# RANCHER
# ----------------------------------------------------------------------
@@ -72,6 +47,12 @@ variable "rke1_version" {
default = "v1.21.14-rancher1-1"
}
+variable "network_plugin" {
+ type = string
+ description = "Network plugin to be used"
+ default = "weave"
+}
+
# ----------------------------------------------------------------------
# USERS
# ----------------------------------------------------------------------
@@ -134,20 +115,6 @@ variable "openstack_external_net" {
default = "ext-net"
}
-# DEPRECATED - new key will always be created
-variable "openstack_ssh_key" {
- type = string
- description = "existing SSH key to use, leave blank for a new one"
- default = ""
-}
-
-# DEPRECATED - use cluster.json
-variable "openstack_zone" {
- type = string
- description = "default zone to use for openstack nodes"
- default = "nova"
-}
-
variable "openstack_security_kubernetes" {
type = map(any)
description = "IP address to allow connections to kube api port, default is rancher nodes"
@@ -158,12 +125,11 @@ variable "openstack_security_kubernetes" {
}
}
-// TODO change this to be ncsa only
variable "openstack_security_ssh" {
type = map(any)
- description = "IP address to allow connections to ssh, default is open to the world"
+ description = "IP address to allow connections to ssh, default is open to NCSA"
default = {
- "world" : "0.0.0.0/0"
+ "world" : "141.142.0.0/16"
}
}
@@ -178,71 +144,17 @@ variable "openstack_os_image" {
type = map(any)
description = "Map from short OS name to image"
default = {
- "centos" = "CentOS-7-GenericCloud-Latest"
- "ubuntu" = "Ubuntu Jammy (22.04) latest"
+ "ubuntu" = {
+ "imagename": "Ubuntu Jammy (22.04) latest"
+ "username": "ubuntu"
+ }
+ "ubuntu22" = {
+ "imagename": "Ubuntu Jammy (22.04) latest"
+ "username": "ubuntu"
+ }
}
}
-# ----------------------------------------------------------------------
-# OPENSTACK NODES
-# ----------------------------------------------------------------------
-
-# DEPRECATED - will always start at 1 with cluster.json
-variable "old_hostnames" {
- type = bool
- description = "should old hostname be used (base 0)"
- default = false
-}
-
-# DEPRECATED - use cluster.json
-variable "os" {
- type = string
- description = "Base image to use for the OS"
- default = "CentOS-7-GenericCloud-Latest"
-}
-
-# DEPRECATED - use cluster.json
-variable "controlplane_count" {
- type = string
- description = "Desired quantity of control-plane nodes"
- default = 1
-}
-
-# DEPRECATED - use cluster.json
-variable "controlplane_flavor" {
- type = string
- description = "Desired flavor of control-plane nodes"
- default = "m1.medium"
-}
-
-# DEPRECATED - use cluster.json
-variable "controlplane_disksize" {
- type = string
- description = "Desired disksize of control-plane nodes"
- default = 40
-}
-
-# DEPRECATED - use cluster.json
-variable "worker_count" {
- type = string
- description = "Desired quantity of worker nodes"
- default = 1
-}
-
-# DEPRECATED - use cluster.json
-variable "worker_flavor" {
- type = string
- description = "Desired flavor of worker nodes"
- default = "m1.large"
-}
-
-# DEPRECATED - use cluster.json
-variable "worker_disksize" {
- type = string
- description = "Desired disksize of worker nodes"
- default = 40
-}
-
# ----------------------------------------------------------------------
# NETWORKING
# ----------------------------------------------------------------------
--
GitLab