Cleanup
This commit is contained in:
		
							parent
							
								
									7bea959b7f
								
							
						
					
					
						commit
						4d414c88f0
					
				
					 3 changed files with 55 additions and 100 deletions
				
			
		|  | @ -20,23 +20,23 @@ locals { | |||
| #   ignition = data.ignition_config.worker.rendered | ||||
| # } | ||||
| 
 | ||||
| resource "matchbox_profile" "worker" { | ||||
|   name   = "worker" | ||||
|   kernel = local.kernel | ||||
|   initrd = [ | ||||
|     "--name main ${local.initrd}" | ||||
|   ] | ||||
|   args = [ | ||||
|     "ip=dhcp", | ||||
|     "initrd=main", | ||||
|     "coreos.live.rootfs_url=${local.rootfs}", | ||||
|     "coreos.inst.install_dev=/dev/vda", | ||||
|     "coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}", | ||||
|     "console=tty0", | ||||
|     "console=ttyS0", | ||||
|   ] | ||||
|   raw_ignition = data.ignition_config.worker.rendered | ||||
| } | ||||
| #resource "matchbox_profile" "worker" { | ||||
| #  name   = "worker" | ||||
| #  kernel = local.kernel | ||||
| #  initrd = [ | ||||
| #    "--name main ${local.initrd}" | ||||
| #  ] | ||||
| #  args = [ | ||||
| #    "ip=dhcp", | ||||
| #    "initrd=main", | ||||
| #    "coreos.live.rootfs_url=${local.rootfs}", | ||||
| #    "coreos.inst.install_dev=/dev/vda", | ||||
| #    "coreos.inst.ignition_url=${var.matchbox_http_endpoint}/ignition?uuid=$${uuid}&mac=$${mac:hexhyp}", | ||||
| #    "console=tty0", | ||||
| #    "console=ttyS0", | ||||
| #  ] | ||||
| #  raw_ignition = data.ignition_config.worker.rendered | ||||
| #} | ||||
| 
 | ||||
| resource "matchbox_profile" "nuc" { | ||||
|   name   = "nuc" | ||||
|  | @ -67,25 +67,25 @@ resource "matchbox_group" "nuc" { | |||
|   } | ||||
| } | ||||
| 
 | ||||
| resource "matchbox_group" "slowworker" { | ||||
|   for_each = var.slowworkers | ||||
| #resource "matchbox_group" "slowworker" { | ||||
| #  for_each = var.slowworkers | ||||
| # | ||||
| #  name    = each.key | ||||
| #  profile = matchbox_profile.worker.name | ||||
| #  selector = { | ||||
| #    mac = each.value | ||||
| #  } | ||||
| # | ||||
| #} | ||||
| 
 | ||||
|   name    = each.key | ||||
|   profile = matchbox_profile.worker.name | ||||
|   selector = { | ||||
|     mac = each.value | ||||
|   } | ||||
| 
 | ||||
| } | ||||
| 
 | ||||
| resource "matchbox_group" "worker" { | ||||
|   name    = "worker" | ||||
|   profile = matchbox_profile.worker.name | ||||
|   selector = { | ||||
|     mac = "52:54:00:c3:51:e8" | ||||
|   } | ||||
| 
 | ||||
| } | ||||
| #resource "matchbox_group" "worker" { | ||||
| #  name    = "worker" | ||||
| #  profile = matchbox_profile.worker.name | ||||
| #  selector = { | ||||
| #    mac = "52:54:00:c3:51:e8" | ||||
| #  } | ||||
| # | ||||
| #} | ||||
| 
 | ||||
| data "ignition_user" "core" { | ||||
|   name = "core" | ||||
|  | @ -95,23 +95,23 @@ data "ignition_user" "core" { | |||
|     var.ssh_authorized_key | ||||
|   ] | ||||
| } | ||||
| 
 | ||||
| data "ignition_config" "worker" { | ||||
|   users = [ | ||||
|     data.ignition_user.core.rendered | ||||
|   ] | ||||
|   systemd = [ | ||||
|     data.ignition_systemd_unit.qemu_ga.rendered, | ||||
|     data.ignition_systemd_unit.k3s_install.rendered, | ||||
|     data.ignition_systemd_unit.worker-images-clean-service.rendered, | ||||
|     data.ignition_systemd_unit.worker-images-clean-timer.rendered | ||||
|   ] | ||||
|   files = [ | ||||
|     data.ignition_file.worker-options.rendered, | ||||
|     data.ignition_file.k3s_agent_install_script.rendered, | ||||
|     data.ignition_file.worker-images-clean.rendered | ||||
|   ] | ||||
| } | ||||
| # | ||||
| #data "ignition_config" "worker" { | ||||
| #  users = [ | ||||
| #    data.ignition_user.core.rendered | ||||
| #  ] | ||||
| #  systemd = [ | ||||
| #    data.ignition_systemd_unit.qemu_ga.rendered, | ||||
| #    data.ignition_systemd_unit.k3s_install.rendered, | ||||
| #    data.ignition_systemd_unit.worker-images-clean-service.rendered, | ||||
| #    data.ignition_systemd_unit.worker-images-clean-timer.rendered | ||||
| #  ] | ||||
| #  files = [ | ||||
| #    data.ignition_file.worker-options.rendered, | ||||
| #    data.ignition_file.k3s_agent_install_script.rendered, | ||||
| #    data.ignition_file.worker-images-clean.rendered | ||||
| #  ] | ||||
| #} | ||||
| data "ignition_config" "nuc" { | ||||
|   users = [ | ||||
|     data.ignition_user.core.rendered | ||||
|  | @ -156,7 +156,7 @@ data "ignition_systemd_unit" "k3s_install" { | |||
| } | ||||
| 
 | ||||
| data "ignition_systemd_unit" "kvm_install" { | ||||
|   name = "kvm-install.service" | ||||
|   name    = "kvm-install.service" | ||||
|   content = file("${path.module}/units/kvm-install.service") | ||||
| } | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue