Git-Mirrors/constellation
1
0
Fork 0
mirror of https://github.com/edgelesssys/constellation.git synced 2025-05-02 14:26:23 -04:00
Code Issues Projects Releases Packages Wiki Activity

Remove all traces of CoreOS from the codebase

Browse source
This commit is contained in:
Malte Poll 2022-10-21 10:16:44 +02:00 • committed by Malte Poll
parent 35e2267cf9
commit 743f5fa627
39 changed files with 117 additions and 799 deletions
Download patch file Download diff file Expand all files Collapse all files

8
cli/internal/terraform/terraform/qemu/main.tf
View file

@ -57,7 +57,7 @@ module "control_plane" {
cidr = "10.42.1.0/24"
network_id = libvirt_network.constellation.id
pool = libvirt_pool.cluster.name
boot_volume_id = libvirt_volume.constellation_coreos_image.id
boot_volume_id = libvirt_volume.constellation_os_image.id
machine = var.machine
firmware = var.firmware
nvram = var.nvram
@ -74,7 +74,7 @@ module "worker" {
cidr = "10.42.2.0/24"
network_id = libvirt_network.constellation.id
pool = libvirt_pool.cluster.name
boot_volume_id = libvirt_volume.constellation_coreos_image.id
boot_volume_id = libvirt_volume.constellation_os_image.id
machine = var.machine
firmware = var.firmware
nvram = var.nvram
@ -87,10 +87,10 @@ resource "libvirt_pool" "cluster" {
path = "/var/lib/libvirt/images"
}
resource "libvirt_volume" "constellation_coreos_image" {
resource "libvirt_volume" "constellation_os_image" {
name = "${var.name}-node-image"
pool = libvirt_pool.cluster.name
source = var.constellation_coreos_image
source = var.constellation_os_image
format = var.image_format
}

2
cli/internal/terraform/terraform/qemu/variables.tf
View file

@ -3,7 +3,7 @@ variable "libvirt_uri" {
description = "libvirt socket uri"
}
variable "constellation_coreos_image" {
variable "constellation_os_image" {
type = string
description = "constellation OS file path"
}

2
cli/internal/terraform/variables.go
View file

@ -155,7 +155,7 @@ func (v *QEMUVariables) String() string {
b.WriteString(v.CommonVariables.String())
writeLinef(b, "libvirt_uri = %q", v.LibvirtURI)
writeLinef(b, "libvirt_socket_path = %q", v.LibvirtSocketPath)
writeLinef(b, "constellation_coreos_image = %q", v.ImagePath)
writeLinef(b, "constellation_os_image = %q", v.ImagePath)
writeLinef(b, "image_format = %q", v.ImageFormat)
writeLinef(b, "vcpus = %d", v.CPUCount)
writeLinef(b, "memory = %d", v.MemorySizeMiB)