Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ module "openstack_cogstack_infra" {
},
]
allowed_ingress_ips_cidr = var.allowed_ingress_ips_cidr
ubuntu_immage_name = var.ubuntu_immage_name
ubuntu_image_name = var.ubuntu_image_name
# generate_random_name_prefix = false
# prefix = "dev"
# network = {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ openstack_environment = {

allowed_ingress_ips_cidr = "10.0.0.1/23"

ubuntu_immage_name = "my_ubuntu_image"
ubuntu_image_name = "my_ubuntu_image"
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ variable "allowed_ingress_ips_cidr" {
type = string
}

variable "ubuntu_immage_name" {
variable "ubuntu_image_name" {
type = string
description = "Name of an available Machine Image running ubuntu in the openstack environment"
}
2 changes: 1 addition & 1 deletion release-please-config.json
Original file line number Diff line number Diff line change
Expand Up @@ -134,7 +134,7 @@
"terraform-modules/openstack-kubernetes-k3s": {
"release-type": "simple",
"component": "terraform-modules/openstack-kubernetes-k3s",
"initial-version": "1.0.0",
"initial-version": "0.1.0",
"changelog-path": "CHANGELOG.md",
"bump-minor-pre-major": false,
"bump-patch-for-minor-pre-major": false,
Expand Down
2 changes: 1 addition & 1 deletion terraform-modules/openstack-kubernetes-k3s/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ module "openstack_kubernetes_cluster" {
name = "public"
}
allowed_ingress_ips_cidr = "0.0.0.0/24"
ubuntu_immage_name = "ubuntu-22.04"
ubuntu_image_name = "ubuntu-22.04"
ssh_key_pair = {
private_key_file = "~/.ssh/id_rsa",
public_key_file = "~/.ssh/id_rsa.pub",
Expand Down
2 changes: 1 addition & 1 deletion terraform-modules/openstack-kubernetes-k3s/compute.tf
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ data "openstack_networking_network_v2" "network" {
}

data "openstack_images_image_v2" "ubuntu" {
name = var.ubuntu_immage_name
name = var.ubuntu_image_name
most_recent = true
}

Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ run "server_and_node" {
command = plan

variables {
ubuntu_immage_name = "ubuntu"
ubuntu_image_name = "ubuntu"
generate_random_name_prefix = false
prefix = "test"
network = { name = "public" }
Expand Down Expand Up @@ -58,7 +58,7 @@ run "required_only" {
command = plan

variables {
ubuntu_immage_name = "ubuntu"
ubuntu_image_name = "ubuntu"
network = { name = "public" }
host_instances = [
{ name = "controller", is_controller = true, flavour = "m1.small" },
Expand Down Expand Up @@ -86,7 +86,7 @@ run "all_variables" {
command = plan

variables {
ubuntu_immage_name = "ubuntu"
ubuntu_image_name = "ubuntu"
allowed_ingress_ips_cidr = "10.1.2.0/24"
k3s_version = "v1.32.2+k3s1"
generate_random_name_prefix = false
Expand Down
4 changes: 2 additions & 2 deletions terraform-modules/openstack-kubernetes-k3s/variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ variable "allowed_ingress_ips_cidr" {
description = "CIDR Block that is allowed ingress to deployed services"
}

variable "ubuntu_immage_name" {
variable "ubuntu_image_name" {
type = string
description = "Name of an available Machine Image running ubuntu in the openstack environment"
}
Expand All @@ -23,7 +23,7 @@ name = Human readable hostname for this host.
is_controller = Must be true for exactly one host. This will run the k3s "server". All other nodes run the k3s "agent".
flavour = The openstack_compute_flavor_v2 for the host
volume_size = Size in GB for the disk volume for the node
image_uuid = (Optional) The Openstack image you want to run, to override the default in ubuntu_immage_name
image_uuid = (Optional) The Openstack image you want to run, to override the default in ubuntu_image_name
floating_ip = (Optional) Floating IP configuration. Set use_floating_ip to true and provide address to associate a floating IP with this host
EOT
type = list(object({
Expand Down
Loading