Merge pull request #15 from pkorovin/packer_plugin_sdk

reads sensible, let's do some progress

builder/openbsd-vmm/builder.go

@@ -7,10 +7,10 @@ import (
 	"path/filepath"
 
 	"github.com/hashicorp/hcl/v2/hcldec"
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer-plugin-sdk/communicator"
+	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	commonsteps "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
 
 const BuilderID = "packer.openbsd-vmm"
@@ -77,7 +77,7 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	)
 
 	steps = append(steps,
-		&common.StepHTTPServer{
+		&commonsteps.StepHTTPServer{
 			HTTPDir:     b.config.HTTPDir,
 			HTTPPortMin: b.config.HTTPPortMin,
 			HTTPPortMax: b.config.HTTPPortMax,
@@ -118,17 +118,17 @@ func (b *Builder) Run(ctx context.Context, ui packer.Ui, hook packer.Hook) (pack
 	)
 
 	steps = append(steps,
-		&common.StepProvision{},
+		&commonsteps.StepProvision{},
 	)
 
 	steps = append(steps,
 		&stepShutdown{},
 	)
 
 	// Run; step-wise if -debug/-on-error=ask
-	b.runner = common.NewRunner(steps, b.config.PackerConfig, ui)
+	b.runner = commonsteps.NewRunner(steps, b.config.PackerConfig, ui)
 	if b.config.PackerDebug {
-		b.runner = common.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
+		b.runner = commonsteps.NewRunnerWithPauseFn(steps, b.config.PackerConfig, ui, state)
 	}
 	b.runner.Run(ctx, state)
 

builder/openbsd-vmm/config.go

@@ -5,13 +5,14 @@ package openbsdvmm
 import (
 	"fmt"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/common/shutdowncommand"
-	"github.com/hashicorp/packer/helper/communicator"
-	"github.com/hashicorp/packer/helper/config"
-	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer-plugin-sdk/bootcommand"
+	common "github.com/hashicorp/packer-plugin-sdk/common"
+	"github.com/hashicorp/packer-plugin-sdk/communicator"
+	commonsteps "github.com/hashicorp/packer-plugin-sdk/multistep/commonsteps"
+	"github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer-plugin-sdk/shutdowncommand"
+	"github.com/hashicorp/packer-plugin-sdk/template/config"
+	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 )
 
 const (
@@ -22,7 +23,7 @@ const (
 
 type Config struct {
 	common.PackerConfig            `mapstructure:",squash"`
-	common.HTTPConfig              `mapstructure:",squash"`
+	commonsteps.HTTPConfig         `mapstructure:",squash"`
 	bootcommand.BootConfig         `mapstructure:",squash"`
 	shutdowncommand.ShutdownConfig `mapstructure:",squash"`
 

builder/openbsd-vmm/driver.go

@@ -12,8 +12,8 @@ import (
 	"strings"
 	"time"
 
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
 
 type Driver interface {

builder/openbsd-vmm/ssh.go

@@ -1,7 +1,7 @@
 package openbsdvmm
 
 import (
-	"github.com/hashicorp/packer/helper/multistep"
+	"github.com/hashicorp/packer-plugin-sdk/multistep"
 )
 
 func CommHost() func(multistep.StateBag) (string, error) {

builder/openbsd-vmm/step_bootcmd.go

@@ -6,38 +6,41 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/common"
-	"github.com/hashicorp/packer/common/bootcommand"
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer-plugin-sdk/bootcommand"
+	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	packersdk "github.com/hashicorp/packer-plugin-sdk/packer"
+	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 )
 
 type stepBootCmd struct {
 	cmd      string
 	BootWait time.Duration
+	VMName   string
 	ctx      interpolate.Context
 }
 
 type bootCommandTemplateData struct {
 	HTTPIP   string
 	HTTPPort int
+	Name     string
 }
 
 func (step *stepBootCmd) Run(ctx context.Context, state multistep.StateBag) multistep.StepAction {
 	config := state.Get("config").(*Config)
 	driver := state.Get("driver").(Driver)
-	ui := state.Get("ui").(packer.Ui)
+	ui := state.Get("ui").(packersdk.Ui)
 
 	step_descr := state.Get("step_descr").(string)
 	httpPort := state.Get("http_port").(int)
 	hostIP := state.Get("host_ip").(string)
 
 	log.Printf("HTTP IP/port: %s:%d", hostIP, httpPort)
-	common.SetHTTPIP(hostIP)
+
+	state.Put("http_ip", hostIP)
 	step.ctx.Data = &bootCommandTemplateData{
 		hostIP,
 		httpPort,
+		step.VMName,
 	}
 
 	if int64(step.BootWait) > 0 {

builder/openbsd-vmm/step_create_disks.go

@@ -4,9 +4,8 @@ import (
 	"context"
 	"fmt"
 	"path/filepath"
-
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
 
 type stepCreateDisks struct {

builder/openbsd-vmm/step_gen_files.go

@@ -9,8 +9,8 @@ import (
 	"path/filepath"
 	"strings"
 
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/template/interpolate"
+	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer-plugin-sdk/template/interpolate"
 )
 
 type stepGenFiles struct {

builder/openbsd-vmm/step_outdir.go

@@ -6,8 +6,8 @@ import (
 	"os"
 	"path/filepath"
 
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
 
 type stepOutDir struct {

builder/openbsd-vmm/step_shutdown.go

@@ -7,8 +7,8 @@ import (
 	"log"
 	"time"
 
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
 
 // This step shuts down the machine. It first attempts to do so gracefully,

builder/openbsd-vmm/step_start_vm.go

@@ -6,8 +6,8 @@ import (
 	"log"
 	"net"
 
-	"github.com/hashicorp/packer/helper/multistep"
-	"github.com/hashicorp/packer/packer"
+	"github.com/hashicorp/packer-plugin-sdk/multistep"
+	"github.com/hashicorp/packer-plugin-sdk/packer"
 )
 
 type stepStartVM struct {

examples/etc/httpd.conf.sample

@@ -3,8 +3,8 @@ server "openbsd.local" {
   log style combined
   root "/htdocs/openbsd"
   location "/snapshots/amd64/" { directory auto index }
+  location "/snapshots/packages/amd64/" { directory auto index }
   location "/snapshots/packages/amd64/all/" { directory auto index }
-  location "/snapshots/amd64/SHA256.sig" { no log }
 }
 
 types { include "/usr/share/misc/mime.types" }

examples/etc/unbound/unbound.conf

@@ -1,4 +1,4 @@
-# $OpenBSD: unbound.conf,v 1.19 2019/11/07 15:46:37 sthen Exp $
+# $OpenBSD: unbound.conf,v 1.21 2020/10/28 11:35:58 sthen Exp $
 
 server:
 	#interface: 127.0.0.1
@@ -19,12 +19,12 @@ server:
 	hide-identity: yes
 	hide-version: yes
 
-	# Perform DNSSEC validation. Comment out the below option to disable.
+	# Perform DNSSEC validation.
 	#
 	auto-trust-anchor-file: "/var/unbound/db/root.key"
 	val-log-level: 2
 
-	# Uncomment to synthesize NXDOMAINs from DNSSEC NSEC chains
+	# Synthesize NXDOMAINs from DNSSEC NSEC chains.
 	# https://tools.ietf.org/html/rfc8198
 	#
 	aggressive-nsec: yes
@@ -39,12 +39,6 @@ server:
 	#local-zone: "2.0.192.in-addr.arpa." static
 	#local-data-ptr: "192.0.2.51 mycomputer.local"
 
-	# UDP EDNS reassembly buffer advertised to peers. Default 4096.
-	# May need lowering on broken networks with fragmentation/MTU issues,
-	# particularly if validating DNSSEC.
-	#
-	#edns-buffer-size: 1480
-
 	# Use TCP for "forward-zone" requests. Useful if you are making
 	# DNS requests over an SSH port forwarding.
 	#

examples/etc/vm.conf.sample

@@ -4,6 +4,7 @@ switch "local" {
 
 vm generic {
 	disable
+	boot device cdrom
 	owner packer_user
 	allow instance { boot, cdrom, disk, instance, interface, memory }
 	memory 1G
@@ -12,7 +13,7 @@ vm generic {
 
 #vm generic instance dev {
 #	disable
-#	memory 4G
+#	memory 2G
 #	disk /home/_vmd/openbsd-dev.qcow2
 #	interface tap { switch "local" }
 #}

examples/packer.env.sample

@@ -2,10 +2,12 @@ XDG_CACHE_HOME=$HOME/.cache
 XDG_CONFIG_HOME=$HOME/.config
 export XDG_CACHE_HOME XDG_CONFIG_HOME
 
+PKR_VAR_home=$HOME
+PKR_VAR_user=$USER
+
 CHECKPOINT_DISABLE=1
-PACKER_CACHE_DIR=$XDG_CACHE_HOME/packer
 PACKER_CONFIG_DIR=$XDG_CONFIG_HOME/packer
+PACKER_CACHE_DIR=$XDG_CACHE_HOME/packer
 PACKER_LOG=1
 PACKER_LOG_PATH=~/.log/packer.log
-PACKER_NO_COLOR=1
-export CHECKPOINT_DISABLE PACKER_CACHE_DIR PACKER_CONFIG_DIR PACKER_LOG PACKER_LOG_PATH PACKER_NO_COLOR
+export PKR_VAR_home PKR_VAR_user CHECKPOINT_DISABLE PACKER_CACHE_DIR PACKER_CONFIG_DIR PACKER_LOG PACKER_LOG_PATH

examples/packer/_http/authorized_keys

@@ -0,0 +1 @@
+Put your root's authorized key here. It will also be used for packer user.

examples/packer/_http/centos.autoinstall.pkr.in

@@ -4,42 +4,47 @@ cdrom
 
 lang en_US.UTF-8
 keyboard us
-timezone Europe/Moscow --utc
+timezone Europe/Moscow --utc --ntpservers=_gateway
 
-network --hostname={{ .VMName }} --onboot yes --bootproto dhcp --noipv6 --activate
+network --hostname=centos --onboot yes --bootproto dhcp --noipv6 --activate
 firewall --enabled --service=ssh
 
 zerombr
 clearpart --all --initlabel
 autopart --type=lvm
-bootloader --append="console=ttyS0,115200 no_timer_check net.ifnames=0" --location=mbr
+bootloader --append="console=ttyS0,115200 no_timer_check net.ifnames=0 clocksource_failover=acpi_pm" --location=mbr
 
-auth --enableshadow --passalgo=sha512 --kickstart
+authselect --useshadow --passalgo sha512
 rootpw packer
-user --name=p --uid 1001 --gid 1001 --groups=wheel --plaintext --password packer
+user --name=packer --uid 1001 --gid 1001 --groups=wheel --plaintext --password packer
 
 selinux --permissive
 services --disabled=kdump --enabled=chronyd,rsyslog,sshd
 
 firstboot --disabled
-reboot
+poweroff
 
-%post --erroronfail
+%post --log=/var/log/anaconda/post-install.log --erroronfail
 dnf clean all
 dnf update -y
 sed -i /^HWADDR=.*/d /etc/sysconfig/network-scripts/ifcfg-eth0
+
 mkdir -m 700 /root/.ssh
 curl http://{{ .HTTPIP }}:{{ .HTTPPort }}/authorized_keys -o /root/.ssh/authorized_keys
 chmod 600 /root/.ssh/authorized_keys
 restorecon -R /root/.ssh/
+cp -R /root/.ssh /home/packer
+chown -R packer.packer /home/p/.ssh
+echo "packer ALL=(ALL) NOPASSWD:ALL" > /etc/sudoers.d/packer
 %end
 
 %packages --excludedocs
 @core
 NetworkManager
+centos-gpg-keys
+centos-stream-repos
 chrony
 curl
-dnf-utils
 dracut-config-generic
 firewalld
 grub2
@@ -51,10 +56,6 @@ sudo
 tar
 vim
 wget
--biosdevname
--dracut-config-rescue
--iprutils
--irqbalance
 -iwl100-firmware
 -iwl1000-firmware
 -iwl105-firmware
@@ -70,8 +71,6 @@ wget
 -iwl6000g2a-firmware
 -iwl6050-firmware
 -iwl7260-firmware
--plymouth
--trousers
 %end
 
 %addon com_redhat_kdump --disable