Merge ~cgrabowski/maas:embed_run_scripts_in_hardware_sync into maas:master

[Christian Grabowski]

add local scripts test

add runner tests

add script metadata endpoint

update script runner for local scripts

provide file extensions

add commissioning scripts

template in hardware-sync executable in systemd config

embed scripts as subcommands

[MAAS Lander (maas-lander)]

UNIT TESTS
-b embed_run_scripts_in_hardware_sync lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11846/console
COMMIT: 634b95be2d5c07bf26583ccb74898f24cc0b8f21

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b embed_run_scripts_in_hardware_sync lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11853/console
COMMIT: f685a1175007bdb4b5b9c99eb093931dcc43d24b

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b embed_run_scripts_in_hardware_sync lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: FAILED
LOG: http://maas-ci.internal:8080/job/maas/job/branch-tester/11854/console
COMMIT: 18a2ec8c7c3bcb36a0ab038a93643e1c77be4060

review: Needs Fixing

[MAAS Lander (maas-lander)]

UNIT TESTS
-b embed_run_scripts_in_hardware_sync lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: c007b066d7f8d3af9a0aa5449100c7f99b75b342

review: Approve

[MAAS Lander (maas-lander)]

UNIT TESTS
-b embed_run_scripts_in_hardware_sync lp:~cgrabowski/maas/+git/maas into -b master lp:~maas-committers/maas

STATUS: SUCCESS
COMMIT: cbfdde8a2055195c1504f5196c7fdee7d27f3da5

review: Approve

[Alberto Donato (ack)]

While I think it's useful to move to a go binary to run maas scripts, I think we should avoid having two different ways to serve scripts that get run on a machine.

As a first step, it'd be useful to have something that works end-to-end using maas-run-scripts from the systemd timer, i.e. generating the config file and just downloading running it periodically.

Later we can replace the script with a go binary, which does the same thing but has no external dependencies, and make optimizations to reduce data transfer.
For instance, the binary could check a url on maas for the exact MAAS version/revision and if it doesn't match, download and re-execute itself.
We could also investigate pre-packaging builtin scripts as a tarball on release so that we serve it statically and only need to download custom scripts.

Whatever we do, we should try to use the same mechanisms and paths on commissioning, brownfield and hardware updates.

WDYT?

review: Needs Information

[Christian Grabowski (cgrabowski)]

> While I think it's useful to move to a go binary to run maas scripts, I think
> we should avoid having two different ways to serve scripts that get run on a
> machine.
>
> As a first step, it'd be useful to have something that works end-to-end using
> maas-run-scripts from the systemd timer, i.e. generating the config file and
> just downloading running it periodically.
>
> Later we can replace the script with a go binary, which does the same thing
> but has no external dependencies, and make optimizations to reduce data
> transfer.
> For instance, the binary could check a url on maas for the exact MAAS
> version/revision and if it doesn't match, download and re-execute itself.
> We could also investigate pre-packaging builtin scripts as a tarball on
> release so that we serve it statically and only need to download custom
> scripts.
>
> Whatever we do, we should try to use the same mechanisms and paths on
> commissioning, brownfield and hardware updates.
>
> WDYT?

Well the original plan was to use maas-run-scripts directly, so I'm not opposed to that. But it would require backing out a fair bit of work at this point.

As discussed on the spec, this already is supposed to replace brownfield (the redirect handler that was added will serve this instead), and it should replace commissioning and testing, but we decided that was out of scope for now, but we can certainly move towards this replacing those as well. So I think the concern of having two ways to run scripts on a machine is valid, but also one that is temporary.

I do like the idea of having a go binary directly replace maas-run-scripts rather than embedding it and executing it as a child proc, but I did think this would be a good first step, and then have maas-run-scripts call out to this binary for each subsequent script.

If having commissioning's way of running scripts being different for the current scope is a concern, I'm fine backing out the existing changes and closing this MP in favor of one that uses maas-run-scripts directly.

[Alberto Donato (ack)]

I do get the point about reducing dependencies on the running system and having a simpler way to deliver binaries, and I think we should eventually replace commissioning/brownfield scripts with a single go binary which fetches all required hardware info, fetches custom scripts and run those, and reports back everything.

This, though, is a much broader scope (it's a whole new feature), so I think that for now we should go for minimal change and just extend the current brownfield method to be run periodically.

Making the main binary a go binary that still uses maas-run-scripts doesn't really reduce our dependency on binaries from the system.

[Christian Grabowski (cgrabowski)]

closing in favor of https://code.launchpad.net/~cgrabowski/maas/+git/maas/+merge/416552

Unmerged commits

cbfdde8... by Christian Grabowski on 2022-02-08

add local scripts test

9bcc406... by Christian Grabowski on 2022-02-08

add runner tests

d35a1dd... by Christian Grabowski on 2022-02-08

add script metadata endpoint

0609567... by Christian Grabowski on 2022-02-08

update script runner for local scripts

b8cce3f... by Christian Grabowski on 2022-02-08

provide file extensions

ad80ec4... by Christian Grabowski on 2022-02-08

add commissioning scripts

696c205... by Christian Grabowski on 2022-02-07

template in hardware-sync executable in systemd config

a90cce8... by Christian Grabowski on 2022-02-07

embed scripts as subcommands

diff --git a/.gitignore b/.gitignore
index dd00eca..45e89ae 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@
 /src/maasui/nodejs
 /src/host-info/bin
 /src/host-info/vendor
+/src/host-info/pkg/scriptrunner/statik
 /stage
 /TAGS
 /tags
diff --git a/src/host-info/Makefile b/src/host-info/Makefile
index d3a2b66..ba682cc 100644
--- a/src/host-info/Makefile
+++ b/src/host-info/Makefile
@@ -21,13 +21,19 @@ HARDWARE_SYNC_DIR := $(CMD_DIR)/hardware-sync
 VENDOR_DIR := $(PACKAGE_DIR)/vendor
 GO_CACHE_DIR := $(shell [ -d $(HOME)/.cache ] && echo $(HOME)/.cache/go-cache || mktemp --tmpdir -d tmp.go-cacheXXX)
 
+SCRIPTS_SRC_DIR := ./scripts/
+SCRIPTS_OUT_DIR := ./pkg/scriptrunner/
+
 .DEFAULT_GOAL := build
 
+$(SCRIPTS_OUT_DIR)statik/statik.go:
+	statik -src=$(SCRIPTS_SRC_DIR) -dest=$(SCRIPTS_OUT_DIR) -f
+
 # XXX: Explicitly set GOCACHE to avoid situations where we can't mkdir $HOME/.cache (autopkgtest VM)
 $(MACHINE_RESOURCES_BINARIES): vendor
 	GOCACHE=$(GO_CACHE_DIR) GOARCH=$(DEB_GO_ARCH_$(notdir $@)) go build -mod vendor -ldflags '-s -w' -o $@ $(PACKAGE_DIR)
 
-$(HARDWARE_SYNC_BINARIES): vendor
+$(HARDWARE_SYNC_BINARIES): vendor $(SCRIPTS_OUT_DIR)statik/statik.go
 	GOCACHE=$(GO_CACHE_DIR) GOARCH=$(DEB_GO_ARCH_$(notdir $@)) go build -mod vendor -ldflags '-s -w' -o $@ $(HARDWARE_SYNC_DIR)
 
 build: $(MACHINE_RESOURCES_BINARIES) $(HARDWARE_SYNC_BINARIES)
@@ -35,6 +41,7 @@ build: $(MACHINE_RESOURCES_BINARIES) $(HARDWARE_SYNC_BINARIES)
 
 clean:
 	rm -rf $(BINDIR) $(VENDOR_DIR)
+	rm -rf $(SCRIPTS_OUT_DIR)statik/
 .PHONY: clean
 
 format:
@@ -53,3 +60,7 @@ update-deps:
 	go get -u all
 	go mod tidy
 .PHONY: update-deps
+
+test:
+	go test -v ./...
+.PHONY: test
diff --git a/src/host-info/cmd/hardware-sync/main.go b/src/host-info/cmd/hardware-sync/main.go
index 9c5960e..97aa250 100644
--- a/src/host-info/cmd/hardware-sync/main.go
+++ b/src/host-info/cmd/hardware-sync/main.go
@@ -4,86 +4,188 @@
 package main
 
 import (
+	"context"
 	"encoding/json"
-	"flag"
 	"fmt"
 	"os"
+	"os/signal"
+	"syscall"
 
 	"host-info/pkg/info"
+	"host-info/pkg/scriptrunner"
 )
 
 // MAASVersion corresponds with the running MAAS version hardware-sync reports to
-var MAASVersion = "" // set at compile time
+var (
+	MAASVersion = "" // set at compile time
 
-const TokenFormat = "'consumer-key:token-key:token-secret[:consumer_secret]'"
+	HelpText = `maas-hardware-sync [-h | -v | --list | COMMAND] [COMMAND_ARGS]
+maas-hardware-sync runs all commands necessary for reporting hardware info to MAAS.
 
-type getMachineTokenOptions struct {
-	SystemId  string
-	TokenFile string
-}
-
-type reportResultsOptions struct {
-	Config       string
-	MachineToken string
-	MetadataUrl  string
-}
-
-type cmdOptions struct {
-	Debug              bool
-	MachineResourceRun bool
-	GetMachineToken    getMachineTokenOptions
-	ReportResults      reportResultsOptions
-}
+maas-hardware-sync -h:                     print help message
+maas-hardware-sync -v:                     print MAAS version this binary is part of
+maas-hardware-sync --list:                 list available commands
+maas-hardware-sync COMMAND [COMMAND_ARGS]: run a command and pass it COMMAND_ARGS
+`
+)
 
-func parseCmdLine() (opts cmdOptions) {
-	flag.BoolVar(&opts.Debug, "debub", false, "print verbose debug messages")
-	flag.BoolVar(&opts.MachineResourceRun, "machine-resources", false, "when set, will read machine resources and print the info to stdout")
-	flag.StringVar(&opts.GetMachineToken.SystemId, "system-id", "", "system ID for the machine to get credentials for")
-	flag.StringVar(&opts.GetMachineToken.TokenFile, "token-file", "", "path for the file to write the token to")
-	flag.StringVar(
-		&opts.ReportResults.Config,
-		"config",
-		"",
-		"cloud-init config with MAAS credentials and endpoint, (e.g. /etc/cloud/cloud.cfg.d/90_dpkg_local_cloud_config.cfg)",
-	)
-	flag.StringVar(
-		&opts.ReportResults.MachineToken,
-		"machine-token",
-		"",
-		fmt.Sprintf("Machine OAuth token, in the %s form", TokenFormat),
-	)
-	flag.StringVar(
-		&opts.ReportResults.MetadataUrl,
-		"metadata-url",
-		"",
-		"MAAS metadata URL",
-	)
-	flag.Parse()
-	return opts
+func parseCmdLine() (cmd string, args []string) {
+	if len(os.Args) < 2 {
+		return "help", args
+	}
+	switch os.Args[1] {
+	case "-h":
+		return "help", args
+	case "-v":
+		return "version", args
+	case "--list":
+		return "list_cmds", args
+	default:
+		if len(os.Args) > 2 {
+			args = os.Args[2:]
+		}
+		return os.Args[1], args
+	}
 }
 
-func getMachineResources() error {
+func getMachineResources() ([]byte, error) {
 	machineResources, err := info.GetInfo()
 	if err != nil {
-		return err
+		return nil, err
 	}
-	encoder := json.NewEncoder(os.Stdout)
-	return encoder.Encode(machineResources)
+	return json.Marshal(machineResources)
+}
+
+func handleSignal(cancel context.CancelFunc) {
+	sigC := make(chan os.Signal, 2)
+	signal.Notify(sigC, syscall.SIGTERM, syscall.SIGINT)
+	<-sigC
+	cancel()
 }
 
 func run() int {
-	opts := parseCmdLine()
+	bkg := context.Background()
+	ctx, cancel := context.WithCancel(bkg)
 
-	if opts.MachineResourceRun {
-		err := getMachineResources()
-		if err != nil {
-			fmt.Printf("an error occurred while fetching machine resources: %s\n", err)
-			return 1
-		}
-		return 0
+	go handleSignal(cancel)
+
+	var out, errOut []byte
+
+	cmd, args := parseCmdLine()
+
+	runner, err := scriptrunner.New()
+	if err != nil {
+		fmt.Printf("failed to initialize script runner: %s\n", err)
+		return 1
+	}
+
+	switch cmd {
+	case "help":
+		out = []byte(HelpText)
+	case "version":
+		out = []byte(MAASVersion)
+	case "list_cmds":
+		out = []byte(scriptrunner.ListCMDs())
+	case scriptrunner.CMDGetMachineToken:
+		out, errOut, err = runner.GetMachineToken(ctx, args)
+	case scriptrunner.CMDRegisterMachine:
+		out, errOut, err = runner.RegisterMachine(ctx, args)
+	case scriptrunner.CMDReportResults:
+		out, errOut, err = runner.ReportResults(ctx, args)
+	case scriptrunner.CMDBMCConfig:
+		out, errOut, err = runner.BMCConfig(ctx, args)
+	case scriptrunner.CMDCaptureLLDPD:
+		out, errOut, err = runner.CaptureLLDPD(ctx, args)
+	case scriptrunner.CMDDHCPUnconfiguredIfaces:
+		out, errOut, err = runner.DHCPUnconfiguredIfaces(ctx, args)
+	case scriptrunner.CMDInstallLLDPD:
+		out, errOut, err = runner.InstallLLDPD(ctx, args)
+	case scriptrunner.CMDMAASGetFruidAPIData:
+		out, errOut, err = runner.MAASGetFruidAPIData(ctx, args)
+	case scriptrunner.CMDMAASKernelCMDLine:
+		out, errOut, err = runner.MAASKernelCMDLine(ctx, args)
+	case scriptrunner.CMDMAASListModaliases:
+		out, errOut, err = runner.MAASListModaliases(ctx, args)
+	case scriptrunner.CMDMAASLSHW:
+		out, errOut, err = runner.MAASLshw(ctx, args)
+	case scriptrunner.CMDMAASSerialPorts:
+		out, errOut, err = runner.MAASSerialPorts(ctx, args)
+	case scriptrunner.CMDMAASSupportInfo:
+		out, errOut, err = runner.MAASSupportInfo(ctx, args)
+	case scriptrunner.CMDMAASCommissioning:
+		out, errOut, err = runner.MAASCommissioning(ctx, args)
+	case scriptrunner.CMDBadBlocks:
+		out, errOut, err = runner.BadBlocks(ctx, args)
+	case scriptrunner.CMDBadBlocksDestructive:
+		args = append([]string{
+			"destructive",
+		}, args...)
+		out, errOut, err = runner.BadBlocks(ctx, args)
+	case scriptrunner.CMDFio:
+		out, errOut, err = runner.Fio(ctx, args)
+	case scriptrunner.CMDGatewayConnectivity:
+		out, errOut, err = runner.GatewayConnectivity(ctx, args)
+	case scriptrunner.CMDInternetConnectivity:
+		out, errOut, err = runner.InternetConnectivity(ctx, args)
+	case scriptrunner.CMDMemTester:
+		out, errOut, err = runner.MemTester(ctx, args)
+	case scriptrunner.CMDNtp:
+		out, errOut, err = runner.Ntp(ctx, args)
+	case scriptrunner.CMDSevenZ:
+		out, errOut, err = runner.SevenZ(ctx, args)
+	case scriptrunner.CMDRackControllerConnectivity:
+		out, errOut, err = runner.RackControllerConnectivity(ctx, args)
+	case scriptrunner.CMDSmartctlConveyance:
+		out, errOut, err = runner.Smartctl(ctx, append([]string{
+			"--test",
+			"conveyance",
+		}, args...))
+	case scriptrunner.CMDSmartctlLong:
+		out, errOut, err = runner.Smartctl(ctx, append([]string{
+			"--test",
+			"long",
+		}, args...))
+	case scriptrunner.CMDSmartctlShort:
+		out, errOut, err = runner.Smartctl(ctx, append([]string{
+			"--test",
+			"short",
+		}, args...))
+	case scriptrunner.CMDSmartctlValidate:
+		out, errOut, err = runner.Smartctl(ctx, append([]string{
+			"--test",
+			"validate",
+		}, args...))
+	case scriptrunner.CMDStressNGCpuLong:
+		out, errOut, err = runner.StressNGCpuLong(ctx, args)
+	case scriptrunner.CMDStressNGCpuShort:
+		out, errOut, err = runner.StressNGCpuShort(ctx, args)
+	case scriptrunner.CMDStressNGMemLong:
+		out, errOut, err = runner.StressNGMemLong(ctx, args)
+	case scriptrunner.CMDStressNGMemShort:
+		out, errOut, err = runner.StressNGMemShort(ctx, args)
+	case "machine-resources":
+		out, err = getMachineResources()
+	case "40-maas-01-machine-resources":
+		out, err = getMachineResources()
+	default:
+		// TODO handle custom scripts for commissioning
+		err = fmt.Errorf("%s is an unknown command", cmd)
+	}
+	if err != nil {
+		fmt.Printf("an error occured while executing '%s': %s\n", os.Args[1], err)
+		return 1
+	}
+	_, err = os.Stdout.Write(out)
+	if err != nil {
+		fmt.Printf("error writing output: %s\n", err)
+		return 1
+	}
+	_, err = os.Stderr.Write(errOut)
+	if err != nil {
+		fmt.Printf("error writing stderr: %s\n", err)
+		return 1
 	}
 
-	// TODO embed scripts and call out to maas_run_scripts
 	return 0
 }
 
diff --git a/src/host-info/go.mod b/src/host-info/go.mod
index 4b414a4..544b842 100644
--- a/src/host-info/go.mod
+++ b/src/host-info/go.mod
@@ -12,6 +12,7 @@ require (
 	github.com/lxc/lxd v0.0.0-20210317085550-5d82899488db
 	github.com/pborman/uuid v1.2.1 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
+	github.com/rakyll/statik v0.1.7
 	github.com/stretchr/testify v1.7.0 // indirect
 	golang.org/x/sys v0.0.0-20210317091845-390168757d9c // indirect
 	gopkg.in/robfig/cron.v2 v2.0.0-20150107220207-be2e0b0deed5 // indirect
diff --git a/src/host-info/go.sum b/src/host-info/go.sum
index 3b1758d..564b524 100644
--- a/src/host-info/go.sum
+++ b/src/host-info/go.sum
@@ -29,6 +29,8 @@ github.com/pkg/errors v0.9.1 h1:FEBLx1zS214owpjy7qsBeixbURkuhQAwrK5UwLGTwt4=
 github.com/pkg/errors v0.9.1/go.mod h1:bwawxfHBFNV+L2hUp1rHADufV3IMtnDRdf1r5NINEl0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
+github.com/rakyll/statik v0.1.7 h1:OF3QCZUuyPxuGEP7B4ypUa7sB/iHtqOTDYZXGM8KOdQ=
+github.com/rakyll/statik v0.1.7/go.mod h1:AlZONWzMtEnMs7W4e/1LURLiI49pIMmp6V9Unghqrcc=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0 h1:nwc3DEeHmmLAfoZucVR881uASk0Mfjw8xYJ99tb5CcY=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
diff --git a/src/host-info/pkg/scriptrunner/runner.go b/src/host-info/pkg/scriptrunner/runner.go
new file mode 100644
index 0000000..040141d
--- /dev/null
+++ b/src/host-info/pkg/scriptrunner/runner.go
@@ -0,0 +1,494 @@
+package scriptrunner
+
+import (
+	"bytes"
+	"context"
+	"fmt"
+	"html/template"
+	"io"
+	"io/ioutil"
+	"net/http"
+	"os/exec"
+	"strings"
+
+	"github.com/rakyll/statik/fs"
+
+	_ "host-info/pkg/scriptrunner/statik"
+)
+
+const (
+	EnvBin         = "/usr/bin/env"
+	BashBin        = "/bin/bash"
+	Python3BinName = "python3"
+
+	MAASScriptsRunner          = "/maas_run_scripts.py"
+	MAASAPIHelper              = "/maas_api_helper.py"
+	BMCConfig                  = "/bmc_config.py"
+	CaptureLLDPD               = "/capture_lldpd.py"
+	DHCPUnconfiguredIfaces     = "/dhcp_unconfigured_ifaces.py"
+	InstallLLDPD               = "/install_lldpd.py"
+	MAASGetFruidApiData        = "/maas-get-fruid-api-data.sh"
+	MAASKernelCMDLine          = "/maas-kernel-cmdline.sh"
+	MAASListModaliases         = "/maas-list-modaliases.sh"
+	MAASLSHW                   = "/maas-lshw.sh"
+	MAASSerialPorts            = "/maas-serial-ports.sh"
+	MAASSupportInfo            = "/maas-support-info.sh"
+	MAASCommissioning          = "/50-maas-01-commissioning.py"
+	BadBlocks                  = "/badblocks.py"
+	BaseConnectivity           = "/base-connectivity.sh"
+	Fio                        = "/fio.py"
+	GatewayConnectivity        = "/gateway-connectivity.sh"
+	InternetConnectivity       = "/internet-connectivity.sh"
+	MemTester                  = "/memtester.sh"
+	Ntp                        = "/ntp.sh"
+	RackControllerConnectivity = "/rack-controller-connectivity.sh"
+	SevenZ                     = "/seven_z.py"
+	Smartctl                   = "/smartctl.py"
+	StressNGCpuLong            = "/stress-ng-cpu-long.sh"
+	StressNGCpuShort           = "/stress-ng-cpu-short.sh"
+	StressNGMemLong            = "/stress-ng-memory-long.sh"
+	StressNGMemShort           = "/stress-ng-memory-short.sh"
+
+	CMDGetMachineToken            = "get-machine-token"
+	CMDRegisterMachine            = "register-machine"
+	CMDReportResults              = "report-results"
+	CMDBMCConfig                  = "30-maas-01-bmc-config"
+	CMDCaptureLLDPD               = "maas-capture-lldpd"
+	CMDDHCPUnconfiguredIfaces     = "20-maas-02-dhcp-unconfigured-ifaces"
+	CMDInstallLLDPD               = "20-maas-01-install-lldpd"
+	CMDMAASGetFruidAPIData        = "maas-get-fruid-api-data"
+	CMDMAASKernelCMDLine          = "maas-kernel-cmdline"
+	CMDMAASListModaliases         = "maas-list-modaliases"
+	CMDMAASLSHW                   = "maas-lshw"
+	CMDMAASSerialPorts            = "maas-serial-ports"
+	CMDMAASSupportInfo            = "maas-support-info"
+	CMDMAASCommissioning          = "50-maas-01-commissioning"
+	CMDBadBlocks                  = "badblocks"
+	CMDBadBlocksDestructive       = "badblocks-destructive"
+	CMDFio                        = "fio"
+	CMDGatewayConnectivity        = "gateway-connectivity"
+	CMDInternetConnectivity       = "internet-connectivity"
+	CMDMemTester                  = "memtester"
+	CMDNtp                        = "ntp"
+	CMDSevenZ                     = "7z"
+	CMDRackControllerConnectivity = "rack-controller-connectivity"
+	CMDSmartctlConveyance         = "smartctl-conveyance"
+	CMDSmartctlLong               = "smartctl-long"
+	CMDSmartctlShort              = "smartctl-short"
+	CMDSmartctlValidate           = "smartctl-validate"
+	CMDStressNGCpuLong            = "stress-ng-cpu-long"
+	CMDStressNGCpuShort           = "stress-ng-cpu-short"
+	CMDStressNGMemLong            = "stress-ng-memory-long"
+	CMDStressNGMemShort           = "stress-ng-memory-short"
+)
+
+func ListCMDs() string {
+	cmdList := []string{
+		CMDGetMachineToken,
+		CMDRegisterMachine,
+		CMDReportResults,
+		CMDBMCConfig,
+		CMDCaptureLLDPD,
+		CMDDHCPUnconfiguredIfaces,
+		CMDInstallLLDPD,
+		CMDMAASGetFruidAPIData,
+		CMDMAASKernelCMDLine,
+		CMDMAASListModaliases,
+		CMDMAASLSHW,
+		CMDMAASSerialPorts,
+		CMDMAASSupportInfo,
+		CMDMAASCommissioning,
+		CMDBadBlocks,
+		CMDBadBlocksDestructive,
+		CMDFio,
+		CMDGatewayConnectivity,
+		CMDInternetConnectivity,
+		CMDMemTester,
+		CMDNtp,
+		CMDSevenZ,
+		CMDRackControllerConnectivity,
+		CMDSmartctlConveyance,
+		CMDSmartctlLong,
+		CMDSmartctlShort,
+		CMDSmartctlValidate,
+		CMDStressNGCpuLong,
+		CMDStressNGCpuShort,
+		CMDStressNGMemLong,
+		CMDStressNGMemShort,
+	}
+	return strings.Join(cmdList, "\n") + "\n"
+}
+
+type ScriptRunner interface {
+	Execute(ctx context.Context, args []string) ([]byte, []byte, error)
+}
+
+func pipeScriptToProcess(script io.Reader, stdin io.WriteCloser) error {
+	defer func() {
+		stdin.Close()
+		if scriptCloser, ok := script.(io.ReadCloser); ok {
+			scriptCloser.Close()
+		}
+	}()
+
+	_, err := io.Copy(stdin, script)
+	if err != nil {
+		return fmt.Errorf("failed piping script to process: %w", err)
+	}
+	return nil
+}
+
+func pipeStd(std io.Reader, stdC chan []byte) error {
+	defer close(stdC)
+
+	var buf bytes.Buffer
+	_, err := io.Copy(&buf, std)
+	if err != nil {
+		return fmt.Errorf("failed piping output to parent: %w", err)
+	}
+	stdC <- buf.Bytes()
+	return nil
+}
+
+type BashRunner struct {
+	Env    []string
+	Script io.Reader
+}
+
+func (b *BashRunner) Execute(ctx context.Context, args []string) ([]byte, []byte, error) {
+	args = append([]string{"-s", "-"}, args...)
+	cmd := exec.CommandContext(ctx, BashBin, args...)
+
+	var key string
+	for i, e := range b.Env {
+		if i%2 == 0 {
+			key = e
+		} else {
+			cmd.Env = append(cmd.Env, fmt.Sprintf("%s=%s", key, e))
+		}
+	}
+
+	stdin, err := cmd.StdinPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to fetch stdin pipe: %w", err)
+	}
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to fetch stdout pipe: %w", err)
+	}
+	stderr, err := cmd.StderrPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to fetch stderr pipe: %w", err)
+	}
+
+	go pipeScriptToProcess(b.Script, stdin)
+
+	stdoutC := make(chan []byte)
+	stderrC := make(chan []byte)
+	go pipeStd(stdout, stdoutC)
+	go pipeStd(stderr, stderrC)
+
+	err = cmd.Run()
+	out := <-stdoutC
+	errOut := <-stderrC
+	if err != nil {
+		return nil, nil, fmt.Errorf(
+			"failed to execute bash script: %w: %s\n----------------\n%s",
+			err,
+			string(out),
+			string(errOut),
+		)
+	}
+	return out, errOut, nil
+}
+
+type Python3ScriptRunner struct {
+	SubCommand string
+	APIHelper  io.ReadCloser
+	Script     io.Reader
+}
+
+func (p *Python3ScriptRunner) Execute(ctx context.Context, args []string) ([]byte, []byte, error) {
+	var cmd *exec.Cmd
+	if len(p.SubCommand) > 0 {
+		cmdArgs := append([]string{Python3BinName, "-", p.SubCommand}, args...)
+		cmd = exec.CommandContext(ctx, EnvBin, cmdArgs...)
+	} else {
+		cmdArgs := append([]string{Python3BinName, "-"}, args...)
+		cmd = exec.CommandContext(ctx, EnvBin, cmdArgs...)
+	}
+
+	stdin, err := cmd.StdinPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to fetch stdin pipe: %w", err)
+	}
+	stdout, err := cmd.StdoutPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to fetch stdout pipe: %w", err)
+	}
+	stderr, err := cmd.StderrPipe()
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to fetch stderr pipe: %w", err)
+	}
+
+	go func() {
+		defer func() {
+			stdin.Close()
+			if p.APIHelper != nil {
+				p.APIHelper.Close()
+			}
+			if script, ok := p.Script.(io.ReadCloser); ok {
+				script.Close()
+			}
+		}()
+
+		if p.APIHelper != nil {
+			io.Copy(stdin, p.APIHelper)
+		}
+		io.Copy(stdin, p.Script)
+	}()
+
+	stdoutC := make(chan []byte)
+	stderrC := make(chan []byte)
+	go pipeStd(stdout, stdoutC)
+	go pipeStd(stderr, stderrC)
+
+	err = cmd.Run()
+	out := <-stdoutC
+	errOut := <-stderrC
+	if err != nil {
+		return nil, nil, fmt.Errorf(
+			"failed to execute python script: %w: %s\n----------------\n%s",
+			err,
+			string(out),
+			string(errOut),
+		)
+	}
+
+	return out, errOut, nil
+}
+
+type runScriptTemplateOptions struct {
+	ImportAPIHelper bool
+}
+
+type Runner struct {
+	scripts http.FileSystem
+}
+
+func New() (*Runner, error) {
+	content, err := fs.New()
+	if err != nil {
+		return nil, err
+	}
+
+	return &Runner{
+		scripts: content,
+	}, nil
+}
+
+func (r *Runner) execMAASRunScripts(ctx context.Context, subcommand string, args []string) ([]byte, []byte, error) {
+	script, err := r.scripts.Open(MAASScriptsRunner)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to load script for '%s': %w", subcommand, err)
+	}
+	defer script.Close()
+	tmpl := template.New("maas_run_scripts")
+	scriptContents, err := ioutil.ReadAll(script)
+	if err != nil {
+		return nil, nil, err
+	}
+	tmpl, err = tmpl.Parse(string(scriptContents))
+	if err != nil {
+		return nil, nil, err
+	}
+	var runScript bytes.Buffer
+	err = tmpl.Execute(&runScript, &runScriptTemplateOptions{ImportAPIHelper: false})
+	if err != nil {
+		return nil, nil, err
+	}
+	apiHelper, err := r.scripts.Open(MAASAPIHelper)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed to load maas_api_helper: %w", err)
+	}
+
+	py := &Python3ScriptRunner{
+		SubCommand: subcommand,
+		APIHelper:  apiHelper,
+		Script:     &runScript,
+	}
+	return py.Execute(ctx, append([]string{"--local-scripts"}, args...))
+}
+
+func (r *Runner) basicPython3Script(ctx context.Context, script string, args []string) ([]byte, []byte, error) {
+	content, err := r.scripts.Open(script)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed loading %s: %w", script, err)
+	}
+
+	py := &Python3ScriptRunner{
+		Script: content,
+	}
+	return py.Execute(ctx, args)
+}
+
+func (r *Runner) basicBashScript(ctx context.Context, script string, args []string) ([]byte, []byte, error) {
+	content, err := r.scripts.Open(script)
+	if err != nil {
+		return nil, nil, fmt.Errorf("failed loading %s: %w", script, err)
+	}
+
+	sh := &BashRunner{
+		Script: content,
+	}
+	return sh.Execute(ctx, args)
+}
+
+type connectivityHelper struct {
+	UseGoTemplate bool
+	Template      string
+}
+
+func (r *Runner) connectivityTest(ctx context.Context, script string, args []string) ([]byte, []byte, error) {
+	baseScript, err := r.scripts.Open(BaseConnectivity)
+	if err != nil {
+		return nil, nil, err
+	}
+	baseContent, err := ioutil.ReadAll(baseScript)
+	if err != nil {
+		return nil, nil, err
+	}
+	connScript, err := r.scripts.Open(script)
+	if err != nil {
+		return nil, nil, err
+	}
+	connContent, err := ioutil.ReadAll(connScript)
+	tmpl := template.New("maas_connectivity")
+	tmpl, err = tmpl.Parse(string(connContent))
+	if err != nil {
+		return nil, nil, err
+	}
+	var connTest bytes.Buffer
+	err = tmpl.Execute(
+		&connTest,
+		connectivityHelper{
+			UseGoTemplate: true,
+			Template:      string(baseContent),
+		},
+	)
+	if err != nil {
+		return nil, nil, err
+	}
+	sh := &BashRunner{
+		Script: &connTest,
+	}
+	return sh.Execute(ctx, nil)
+}
+
+func (r *Runner) GetMachineToken(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.execMAASRunScripts(ctx, CMDGetMachineToken, args)
+}
+
+func (r *Runner) RegisterMachine(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.execMAASRunScripts(ctx, CMDRegisterMachine, args)
+}
+
+func (r *Runner) ReportResults(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.execMAASRunScripts(ctx, CMDReportResults, args)
+}
+
+func (r *Runner) BMCConfig(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, BMCConfig, args)
+}
+
+func (r *Runner) CaptureLLDPD(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, CaptureLLDPD, args)
+}
+
+func (r *Runner) DHCPUnconfiguredIfaces(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, DHCPUnconfiguredIfaces, args)
+}
+
+func (r *Runner) InstallLLDPD(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, InstallLLDPD, args)
+}
+
+func (r *Runner) MAASGetFruidAPIData(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, MAASGetFruidApiData, args)
+}
+
+func (r *Runner) MAASKernelCMDLine(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, MAASKernelCMDLine, args)
+}
+
+func (r *Runner) MAASListModaliases(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, MAASListModaliases, args)
+}
+
+func (r *Runner) MAASLshw(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, MAASLSHW, args)
+}
+
+func (r *Runner) MAASSerialPorts(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, MAASSerialPorts, args)
+}
+
+func (r *Runner) MAASSupportInfo(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, MAASSupportInfo, args)
+}
+
+func (r *Runner) MAASCommissioning(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, MAASCommissioning, args)
+}
+
+func (r *Runner) BadBlocks(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, BadBlocks, args)
+}
+
+func (r *Runner) Fio(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, Fio, args)
+}
+
+func (r *Runner) GatewayConnectivity(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.connectivityTest(ctx, GatewayConnectivity, args)
+}
+
+func (r *Runner) InternetConnectivity(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.connectivityTest(ctx, InternetConnectivity, args)
+}
+
+func (r *Runner) MemTester(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, MemTester, args)
+}
+
+func (r *Runner) Ntp(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, Ntp, args)
+}
+
+func (r *Runner) RackControllerConnectivity(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.connectivityTest(ctx, RackControllerConnectivity, args)
+}
+
+func (r *Runner) SevenZ(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, SevenZ, args)
+}
+
+func (r *Runner) Smartctl(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicPython3Script(ctx, Smartctl, args)
+}
+
+func (r *Runner) StressNGCpuLong(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, StressNGCpuLong, args)
+}
+
+func (r *Runner) StressNGCpuShort(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, StressNGCpuShort, args)
+}
+
+func (r *Runner) StressNGMemLong(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, StressNGMemLong, args)
+}
+
+func (r *Runner) StressNGMemShort(ctx context.Context, args []string) ([]byte, []byte, error) {
+	return r.basicBashScript(ctx, StressNGMemShort, args)
+}
diff --git a/src/host-info/pkg/scriptrunner/runner_test.go b/src/host-info/pkg/scriptrunner/runner_test.go
new file mode 100644
index 0000000..f582817
--- /dev/null
+++ b/src/host-info/pkg/scriptrunner/runner_test.go
@@ -0,0 +1,164 @@
+package scriptrunner
+
+import (
+	"bytes"
+	"context"
+	"os"
+	"strings"
+	"testing"
+)
+
+const bashPrintInput = `#!/bin/bash
+env
+echo $@
+`
+
+const bashExitOne = `#!/bin/bash
+echo "error message" && exit 1
+`
+
+const python3PrintInput = `import os
+import sys
+
+print(os.environ.items())
+print("\n".join(sys.argv))
+`
+
+const python3ExitOne = `import os
+
+print("error message")
+os.exit(1)
+`
+
+func TestBashRunner(t *testing.T) {
+	table := []struct {
+		Name string
+		Env  []string
+		Args []string
+	}{
+		{
+			Name: "just_command_cleanly_executes",
+		},
+		{
+			Name: "command_with_args",
+			Args: []string{"--arg", "val"},
+		},
+		{
+			Name: "command_with_env",
+			Env:  []string{"ENV_VAR", "val"},
+		},
+		{
+			Name: "command_with_args_and_env",
+			Env:  []string{"ENV_VAR", "val"},
+			Args: []string{"--args", "val"},
+		},
+	}
+
+	for _, tcase := range table {
+		t.Run(tcase.Name, func(tt *testing.T) {
+			runner := &BashRunner{
+				Env:    tcase.Env,
+				Script: bytes.NewBuffer([]byte(bashPrintInput)),
+			}
+			stdout, _, err := runner.Execute(context.Background(), tcase.Args)
+			if err != nil {
+				tt.Fatal(err)
+			}
+			for _, envvar := range tcase.Env {
+				if !strings.Contains(string(stdout), envvar) {
+					tt.Errorf("%s does not contain %s", stdout, envvar)
+				}
+			}
+			for _, arg := range tcase.Args {
+				if !strings.Contains(string(stdout), arg) {
+					tt.Errorf("%s does not contain %s", stdout, arg)
+				}
+			}
+		})
+	}
+}
+
+func TestBashRunnerInheritsParentEnv(t *testing.T) {
+	os.Setenv("TEST_VAR", "test_val")
+	defer os.Setenv("TEST_VAR", "")
+	runner := &BashRunner{
+		Script: bytes.NewBuffer([]byte(bashPrintInput)),
+	}
+	stdout, _, err := runner.Execute(context.Background(), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !strings.Contains(string(stdout), "TEST_VAR=test_val") {
+		t.Fatalf("%s does not contain TEST_VAR=test_val", stdout)
+	}
+}
+
+func TestBashRunnerReturnsErrorWhenScriptExitsNon0(t *testing.T) {
+	runner := &BashRunner{
+		Script: bytes.NewBuffer([]byte(bashExitOne)),
+	}
+	_, _, err := runner.Execute(context.Background(), nil)
+	if err == nil {
+		t.Fatal("expected an error to be returned")
+	}
+}
+
+func TestPython3ScriptRunner(t *testing.T) {
+	table := []struct {
+		Name string
+		Args []string
+	}{
+		{
+			Name: "just_command_cleanly_execute",
+		},
+		{
+			Name: "command_with_args",
+			Args: []string{"--args", "val"},
+		},
+	}
+	for _, tcase := range table {
+		t.Run(tcase.Name, func(tt *testing.T) {
+			runner := &Python3ScriptRunner{
+				Script: bytes.NewBuffer([]byte(python3PrintInput)),
+			}
+			stdout, _, err := runner.Execute(context.Background(), tcase.Args)
+			if err != nil {
+				tt.Fatal(err)
+			}
+			for _, arg := range tcase.Args {
+				if !strings.Contains(string(stdout), arg) {
+					tt.Errorf("%s does not contain %s", stdout, arg)
+				}
+			}
+		})
+	}
+
+}
+
+func TestPython3RunnerInheritsParentEnv(t *testing.T) {
+	os.Setenv("TEST_VAR", "test_val")
+	defer os.Setenv("TEST_VAR", "")
+	runner := &Python3ScriptRunner{
+		Script: bytes.NewBuffer([]byte(python3PrintInput)),
+	}
+	stdout, _, err := runner.Execute(context.Background(), nil)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if !strings.Contains(string(stdout), "TEST_VAR") {
+		t.Fatalf("%s does not contain TEST_VAR", stdout)
+	}
+	if !strings.Contains(string(stdout), "test_val") {
+		t.Fatalf("%s does not contain test_val", stdout)
+	}
+}
+
+func TestPython3RunnerReturnsErrorWhenScriptExitsNon0(t *testing.T) {
+	runner := &Python3ScriptRunner{
+		Script: bytes.NewBuffer([]byte(python3ExitOne)),
+	}
+	_, _, err := runner.Execute(context.Background(), nil)
+	if err == nil {
+		t.Fatal("expected an error to be returned")
+	}
+}
diff --git a/src/host-info/scripts/50-maas-01-commissioning.py b/src/host-info/scripts/50-maas-01-commissioning.py
new file mode 120000
index 0000000..aa47949
--- /dev/null
+++ b/src/host-info/scripts/50-maas-01-commissioning.py
@@ -0,0 +1 @@
+/home/christian/maas/src/provisioningserver/refresh/50-maas-01-commissioning
\ No newline at end of file
diff --git a/src/host-info/scripts/badblocks.py b/src/host-info/scripts/badblocks.py
new file mode 120000
index 0000000..1386716
--- /dev/null
+++ b/src/host-info/scripts/badblocks.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/badblocks.py
\ No newline at end of file
diff --git a/src/host-info/scripts/base-connectivity.sh b/src/host-info/scripts/base-connectivity.sh
new file mode 120000
index 0000000..ef91a26
--- /dev/null
+++ b/src/host-info/scripts/base-connectivity.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/base-connectivity.sh
\ No newline at end of file
diff --git a/src/host-info/scripts/bmc_config.py b/src/host-info/scripts/bmc_config.py
new file mode 120000
index 0000000..eb6352e
--- /dev/null
+++ b/src/host-info/scripts/bmc_config.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/commissioning_scripts/bmc_config.py
\ No newline at end of file
diff --git a/src/host-info/scripts/capture_lldpd.py b/src/host-info/scripts/capture_lldpd.py
new file mode 120000
index 0000000..44218a5
--- /dev/null
+++ b/src/host-info/scripts/capture_lldpd.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/commissioning_scripts/capture_lldpd.py
\ No newline at end of file
diff --git a/src/host-info/scripts/dhcp_unconfigured_ifaces.py b/src/host-info/scripts/dhcp_unconfigured_ifaces.py
new file mode 120000
index 0000000..7510086
--- /dev/null
+++ b/src/host-info/scripts/dhcp_unconfigured_ifaces.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/commissioning_scripts/dhcp_unconfigured_ifaces.py
\ No newline at end of file
diff --git a/src/host-info/scripts/fio.py b/src/host-info/scripts/fio.py
new file mode 120000
index 0000000..e1ad126
--- /dev/null
+++ b/src/host-info/scripts/fio.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/fio.py
\ No newline at end of file
diff --git a/src/host-info/scripts/gateway-connectivity.sh b/src/host-info/scripts/gateway-connectivity.sh
new file mode 100644
index 0000000..25cd583
--- /dev/null
+++ b/src/host-info/scripts/gateway-connectivity.sh
@@ -0,0 +1,115 @@
+#!/bin/bash
+#
+# gateway-connectivity - Check if an interface has access to the configured gateway.
+#
+# Author: Lee Trager <[e-mail]>
+#
+# Copyright (C) 2019-2022 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# --- Start MAAS 1.0 script metadata ---
+# name: gateway-connectivity
+# title: Gateway Connectivity Validation
+# description: Check if an interface has access to the configured gateway.
+# tags:
+#   - network-validation
+# script_type: test
+# hardware_type: network
+# parallel: instance
+# parameters:
+#   interface:
+#     type: interface
+# apply_configured_networking: True
+# timeout: 00:05:00
+# --- End MAAS 1.0 script metadata ---
+
+{{.InjectFile}}
+
+OPTS=$(getopt -o 'i:h' --long 'interface:,help' -n 'gateway-connectivity' -- "$@")
+
+if [ $? -ne 0 ]; then
+    exit 1
+fi
+
+eval set -- "$OPTS"
+unset OPTS
+
+while true; do
+    case "$1" in
+        '-i'|'--interface')
+            INTERFACE=$2
+            shift 2
+            continue
+            ;;
+        '-h'|'--help')
+            echo "usage: gateway-connectivity [--interface INTERFACE]"
+            echo
+            echo "Check if an interface has access to the configured gateway."
+            echo
+            echo "optional arguments:"
+            echo "  -h, --help         Show this message"
+            echo "  -i, --interface    The interface to test gateway connectivity with."
+            echo "                     Default: Any interface"
+            exit 0
+            ;;
+        '--')
+            shift
+            break
+            ;;
+        *)
+            echo "Unknown argument $1!" >&2
+            exit 1
+    esac
+done
+
+
+if [ -n "$INTERFACE" ]; then
+    IP_ARGS="dev $INTERFACE"
+fi
+
+AWK_SCRIPT='
+{
+    for(i = 0; i < NF; i++) {
+        if($i == "via") {
+            print $(i + 1);
+            break;
+        }
+    }
+}
+'
+
+for gateway in $(ip route show $IP_ARGS | awk "$AWK_SCRIPT"); do
+    if [ -n "$gateways" ]; then
+        gateways="$gateways,$gateway"
+    else
+        gateways="$gateway"
+    fi
+done
+
+for gateway in $(ip -6 route show $IP_ARGS | awk "$AWK_SCRIPT"); do
+    if [ -n "$gateways" ]; then
+        gateways="$gateways,$gateway"
+    else
+        gateways="$gateway"
+    fi
+done
+
+if [ -z "$gateways" ]; then
+    echo "WARNING: No gateways configured, skipping test"
+    [ -n "$RESULT_PATH" ] && echo "{status: skipped}" >> $RESULT_PATH
+    exit 0
+fi
+
+test_interface "$INTERFACE" "$gateways"
diff --git a/src/host-info/scripts/install_lldpd.py b/src/host-info/scripts/install_lldpd.py
new file mode 120000
index 0000000..9d76c0b
--- /dev/null
+++ b/src/host-info/scripts/install_lldpd.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/commissioning_scripts/install_lldpd.py
\ No newline at end of file
diff --git a/src/host-info/scripts/internet-connectivity.sh b/src/host-info/scripts/internet-connectivity.sh
new file mode 100644
index 0000000..bcfd95b
--- /dev/null
+++ b/src/host-info/scripts/internet-connectivity.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+#
+# internet-connectivity - Check if an interface can access the specified URL(s).
+#
+# Author: Lee Trager <[e-mail]>
+#
+# Copyright (C) 2017-2019 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# --- Start MAAS 1.0 script metadata ---
+# name: internet-connectivity
+# title: Internet Connectivity Validation
+# description: Check if an interface can access the specified URL(s).
+# tags:
+#   - internet
+#   - network-validation
+# script_type: test
+# hardware_type: network
+# parallel: instance
+# parameters:
+#   interface:
+#     type: interface
+#   url:
+#     type: url
+#     description: A comma separated list of URLs, IPs, or domains to test if 
+#                  all the interfaces have access to. Any protocol supported
+#                  by curl is supported. If no protocol or icmp is given the
+#                  URL will be pinged.
+#     default: https://connectivity-check.ubuntu.com
+#     required: True
+#     allow_list: True
+# apply_configured_networking: True
+# timeout: 00:05:00
+# --- End MAAS 1.0 script metadata ---
+
+{{.InjectFile}}
+
+OPTS=$(getopt -o 'i:u:h' --long 'interface:,url:,help' -n 'internet-connectivity' -- "$@")
+
+if [ $? -ne 0 ]; then
+    exit 1
+fi
+
+eval set -- "$OPTS"
+unset OPTS
+
+while true; do
+    case "$1" in
+        '-i'|'--interface')
+            INTERFACE=$2
+            shift 2
+            continue
+            ;;
+        '-u'|'--url')
+            URL=$2
+            shift 2
+            continue
+            ;;
+        '-h'|'--help')
+            echo "usage: internet-connectivity [--interface INTERFACE] [--url URL]"
+            echo
+            echo "Check if an interface can access the specified URL(s)."
+            echo
+            echo "optional arguments:"
+            echo "  -h, --help         Show this message"
+            echo "  -i, --interface    The interface to test internet connectivity with."
+            echo "                     Default: Any interface"
+            echo "  -u, --url          A URL or comma seperated list of URLs that should be accessible."
+            echo "                     Default: https://connectivity-check.ubuntu.com"
+            exit 0
+            ;;
+        '--')
+            shift
+            break
+            ;;
+        *)
+            echo "Unknown argument $1!" >&2
+            exit 1
+    esac
+done
+
+if [ -z "$URL" ]; then
+    URL="https://connectivity-check.ubuntu.com"
+fi
+
+test_interface "$INTERFACE" "$URL"
diff --git a/src/host-info/scripts/maas-get-fruid-api-data.sh b/src/host-info/scripts/maas-get-fruid-api-data.sh
new file mode 120000
index 0000000..a142ee1
--- /dev/null
+++ b/src/host-info/scripts/maas-get-fruid-api-data.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/commissioning_scripts/maas-get-fruid-api-data
\ No newline at end of file
diff --git a/src/host-info/scripts/maas-kernel-cmdline.sh b/src/host-info/scripts/maas-kernel-cmdline.sh
new file mode 120000
index 0000000..8660214
--- /dev/null
+++ b/src/host-info/scripts/maas-kernel-cmdline.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/commissioning_scripts/maas-kernel-cmdline
\ No newline at end of file
diff --git a/src/host-info/scripts/maas-list-modaliases.sh b/src/host-info/scripts/maas-list-modaliases.sh
new file mode 120000
index 0000000..c11273f
--- /dev/null
+++ b/src/host-info/scripts/maas-list-modaliases.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/provisioningserver/refresh/maas-list-modaliases
\ No newline at end of file
diff --git a/src/host-info/scripts/maas-lshw.sh b/src/host-info/scripts/maas-lshw.sh
new file mode 120000
index 0000000..6d7fd41
--- /dev/null
+++ b/src/host-info/scripts/maas-lshw.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/provisioningserver/refresh/maas-lshw
\ No newline at end of file
diff --git a/src/host-info/scripts/maas-serial-ports.sh b/src/host-info/scripts/maas-serial-ports.sh
new file mode 120000
index 0000000..593de7b
--- /dev/null
+++ b/src/host-info/scripts/maas-serial-ports.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/provisioningserver/refresh/maas-serial-ports
\ No newline at end of file
diff --git a/src/host-info/scripts/maas-support-info.sh b/src/host-info/scripts/maas-support-info.sh
new file mode 120000
index 0000000..435a4b7
--- /dev/null
+++ b/src/host-info/scripts/maas-support-info.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/provisioningserver/refresh/maas-support-info
\ No newline at end of file
diff --git a/src/host-info/scripts/maas_api_helper.py b/src/host-info/scripts/maas_api_helper.py
new file mode 120000
index 0000000..7763d27
--- /dev/null
+++ b/src/host-info/scripts/maas_api_helper.py
@@ -0,0 +1 @@
+/home/christian/maas/src/provisioningserver/refresh/maas_api_helper.py
\ No newline at end of file
diff --git a/src/host-info/scripts/maas_run_scripts.py b/src/host-info/scripts/maas_run_scripts.py
new file mode 120000
index 0000000..699c33e
--- /dev/null
+++ b/src/host-info/scripts/maas_run_scripts.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/user_data/templates/snippets/maas_run_scripts.py
\ No newline at end of file
diff --git a/src/host-info/scripts/memtester.sh b/src/host-info/scripts/memtester.sh
new file mode 120000
index 0000000..df3fe25
--- /dev/null
+++ b/src/host-info/scripts/memtester.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/memtester.sh
\ No newline at end of file
diff --git a/src/host-info/scripts/ntp.sh b/src/host-info/scripts/ntp.sh
new file mode 120000
index 0000000..5378686
--- /dev/null
+++ b/src/host-info/scripts/ntp.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/ntp.sh
\ No newline at end of file
diff --git a/src/host-info/scripts/rack-controller-connectivity.sh b/src/host-info/scripts/rack-controller-connectivity.sh
new file mode 100644
index 0000000..b9ab9b3
--- /dev/null
+++ b/src/host-info/scripts/rack-controller-connectivity.sh
@@ -0,0 +1,99 @@
+#!/bin/bash
+#
+# rack-controller-connectivity - Check if an interface has access to the booted rack controller.
+#
+# Author: Lee Trager <[e-mail]>
+#
+# Copyright (C) 2019 Canonical
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as
+# published by the Free Software Foundation, either version 3 of the
+# License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with this program.  If not, see <http://www.gnu.org/licenses/>.
+#
+# --- Start MAAS 1.0 script metadata ---
+# name: rack-controller-connectivity
+# title: Gateway Connectivity Validation
+# description: Check if an interface has access to the booted rack controller.
+# tags:
+#   - network-validation
+# script_type: test
+# hardware_type: network
+# parallel: instance
+# parameters:
+#   interface:
+#     type: interface
+# apply_configured_networking: True
+# timeout: 00:05:00
+# --- End MAAS 1.0 script metadata ---
+
+{{.InjectFile}}
+
+OPTS=$(getopt -o 'i:h' --long 'interface:,help' -n 'rack-controller-connectivity' -- "$@")
+
+if [ $? -ne 0 ]; then
+    exit 1
+fi
+
+eval set -- "$OPTS"
+unset OPTS
+
+while true; do
+    case "$1" in
+        '-i'|'--interface')
+            INTERFACE=$2
+            shift 2
+            continue
+            ;;
+        '-h'|'--help')
+            echo "usage: rack-controller-connectivity [--interface INTERFACE]"
+            echo
+            echo "Check if an interface has access to the booted rack controller."
+            echo
+            echo "optional arguments:"
+            echo "  -h, --help         Show this message"
+            echo "  -i, --interface    The interface to test rack controller connectivity with."
+            echo "                     Default: Any interface"
+            exit 0
+            ;;
+        '--')
+            shift
+            break
+            ;;
+        *)
+            echo "Unknown argument $1!" >&2
+            exit 1
+    esac
+done
+
+# When booting into the ephemeral environment root is the retrieved from
+# the rack controller.
+for i in $(cat /proc/cmdline); do
+    arg=$(echo $i | cut -d '=' -f1)
+    if [ "$arg" == "root" ]; then
+        value=$(echo $i | cut -d '=' -f2-)
+        # MAAS normally specifies the file has "filetype:url"
+        filetype=$(echo $value | cut -d ':' -f1)
+        if [ "$filetype" == "squash" ]; then
+            url=$(echo $value | cut -d ':' -f2-)
+        else
+            url=$filetype
+        fi
+        break
+    fi
+done
+
+if [ -z "$url" ] || $(echo "$url" | grep -vq "://"); then
+    echo "ERROR: Unable to find rack controller URL!"
+    exit 1
+fi
+
+test_interface "$INTERFACE" "$url"
diff --git a/src/host-info/scripts/seven_z.py b/src/host-info/scripts/seven_z.py
new file mode 120000
index 0000000..a769a0e
--- /dev/null
+++ b/src/host-info/scripts/seven_z.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/seven_z.py
\ No newline at end of file
diff --git a/src/host-info/scripts/smartctl.py b/src/host-info/scripts/smartctl.py
new file mode 120000
index 0000000..918166a
--- /dev/null
+++ b/src/host-info/scripts/smartctl.py
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/smartctl.py
\ No newline at end of file
diff --git a/src/host-info/scripts/stress-ng-cpu-long.sh b/src/host-info/scripts/stress-ng-cpu-long.sh
new file mode 120000
index 0000000..bdb03ae
--- /dev/null
+++ b/src/host-info/scripts/stress-ng-cpu-long.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/stress-ng-cpu-long.sh
\ No newline at end of file
diff --git a/src/host-info/scripts/stress-ng-cpu-short.sh b/src/host-info/scripts/stress-ng-cpu-short.sh
new file mode 120000
index 0000000..1626d40
--- /dev/null
+++ b/src/host-info/scripts/stress-ng-cpu-short.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/stress-ng-cpu-short.sh
\ No newline at end of file
diff --git a/src/host-info/scripts/stress-ng-memory-long.sh b/src/host-info/scripts/stress-ng-memory-long.sh
new file mode 120000
index 0000000..911a85f
--- /dev/null
+++ b/src/host-info/scripts/stress-ng-memory-long.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/stress-ng-memory-long.sh
\ No newline at end of file
diff --git a/src/host-info/scripts/stress-ng-memory-short.sh b/src/host-info/scripts/stress-ng-memory-short.sh
new file mode 120000
index 0000000..2cc8c96
--- /dev/null
+++ b/src/host-info/scripts/stress-ng-memory-short.sh
@@ -0,0 +1 @@
+/home/christian/maas/src/metadataserver/builtin_scripts/testing_scripts/stress-ng-memory-short.sh
\ No newline at end of file
diff --git a/src/metadataserver/api.py b/src/metadataserver/api.py
index 787e628..add0920 100644
--- a/src/metadataserver/api.py
+++ b/src/metadataserver/api.py
@@ -1442,6 +1442,80 @@ class MAASScriptsHandler(OperationsHandler):
         )
 
 
+class MAASScriptsMetadataHandler(OperationsHandler):
+    def _get_script_meta_data(self, script_set, mtime, include_finshed=False):
+        if script_set is None:
+            return []
+
+        meta_data = []
+        for script_result in script_set:
+            # Don't rerun Scripts which have already run.
+            if (
+                not include_finshed
+                and script_result.status
+                not in SCRIPT_STATUS_RUNNING_OR_PENDING
+            ):
+                continue
+
+            md_item = {}
+            if script_result.script is None:
+                # Script was deleted by the user and it is not a builtin
+                # commissioning script. Don't expect a result.
+                script_result.delete()
+                continue
+
+            md_item = get_script_result_properties(script_result)
+            meta_data.append(md_item)
+        return meta_data
+
+    def read(self, request, version, mac=None):
+        node = get_queried_node(request)
+        mtime = time.time()
+        meta_data = {}
+
+        if (
+            node.status
+            in (
+                NODE_STATUS.COMMISSIONING,
+                NODE_STATUS.DEPLOYED,
+                NODE_STATUS.ENTERING_RESCUE_MODE,
+                NODE_STATUS.RESCUE_MODE,
+            )
+            and node.current_commissioning_script_set is not None
+        ):
+            # Prefetch all the data we need.
+            qs = node.current_commissioning_script_set.scriptresult_set
+            qs = qs.select_related("script", "script__script")
+            # After the script runner finishes sending all commissioning
+            # results it redownloads the script tar. It does this in-case
+            # a commissioning script discovers hardware associated with
+            # hardware identified in the for_hardware field of a script.
+            # select_for_hardware_scripts() processes the output of the
+            # builtin commissioning scripts and adds any associated script.
+            # This does not need to happen the first time the script runner
+            # downloads the tar as the region has not yet received new
+            # data.
+            for script_result in qs:
+                if script_result.status != SCRIPT_STATUS.PENDING:
+                    script_set = node.current_commissioning_script_set
+                    script_set.select_for_hardware_scripts()
+                    break
+            meta_data["commissioning_scripts"] = self._get_script_meta_data(
+                node.current_commissioning_script_set, mtime
+            )
+
+        if node.current_testing_script_set is not None:
+            qs = node.current_testing_script_set.scriptresult_set
+            qs = qs.select_related("script", "script__script")
+            meta_data["testing_scripts"] = self._get_script_meta_data(
+                node.current_testing_script_set, mtime
+            )
+
+        return HttpResponse(
+            json.dumps({"1.0": meta_data}), content_type="application/json"
+        )
+
+
 class AnonMetaDataHandler(VersionIndexHandler):
     """Anonymous metadata."""
 
diff --git a/src/metadataserver/builtin_scripts/testing_scripts/badblocks.py b/src/metadataserver/builtin_scripts/testing_scripts/badblocks.py
index f52f544..5df0f13 100755
--- a/src/metadataserver/builtin_scripts/testing_scripts/badblocks.py
+++ b/src/metadataserver/builtin_scripts/testing_scripts/badblocks.py
@@ -203,7 +203,9 @@ def run_badblocks(storage, destructive=False):
 
 if __name__ == "__main__":
     # Determine if badblocks should run destructively from the script name.
-    if "destructive" in sys.argv[0]:
+    if "destructive" in sys.argv[0] or (
+        len(sys.argv) >= 2 and sys.argv[1] == "destructive"
+    ):
         destructive = True
     else:
         destructive = False
diff --git a/src/metadataserver/builtin_scripts/testing_scripts/gateway-connectivity.sh b/src/metadataserver/builtin_scripts/testing_scripts/gateway-connectivity.sh
index 543d6a0..f6e8fd8 100644
--- a/src/metadataserver/builtin_scripts/testing_scripts/gateway-connectivity.sh
+++ b/src/metadataserver/builtin_scripts/testing_scripts/gateway-connectivity.sh
@@ -4,7 +4,7 @@
 #
 # Author: Lee Trager <[e-mail]>
 #
-# Copyright (C) 2019 Canonical
+# Copyright (C) 2019-2022 Canonical
 #
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU Affero General Public License as
diff --git a/src/metadataserver/templates/hardware_sync_service.template b/src/metadataserver/templates/hardware_sync_service.template
index 806bd42..bfc9e68 100644
--- a/src/metadataserver/templates/hardware_sync_service.template
+++ b/src/metadataserver/templates/hardware_sync_service.template
@@ -8,4 +8,9 @@ After=network.target
 type=oneshot
 ExecStartPre=/usr/bin/wget -O /usr/bin/maas-hardware-sync {{ maas_url }}/hardware-sync/{{ architecture }}
 ExecStartPre=/bin/chmod 0755 /usr/bin/maas-hardware-sync
-ExecStart=/bin/echo "TODO run hardware-sync commands"
+ExecStartPre=/usr/bin/maas-hardware-sync get-machine-token\
+    --maas-url '{{ maas_url }}'\
+    --admin_token '{{ admin_token }}'\
+    --system-id '{{ system_id }}'\
+    --token-file '{{ token_file_path }}'
+ExecStart=/usr/bin/maas-hardware-sync report-results --config '{{ token_file_path }}'
diff --git a/src/metadataserver/tests/test_api.py b/src/metadataserver/tests/test_api.py
index 8b8b5bd..e6a4fbb 100644
--- a/src/metadataserver/tests/test_api.py
+++ b/src/metadataserver/tests/test_api.py
@@ -4029,3 +4029,124 @@ class TestEnlistViews(MAASServerTestCase):
             response.content.decode(settings.DEFAULT_CHARSET).splitlines(),
             ContainsAll(("user-data", "meta-data")),
         )
+
+
+class TestMAASScriptsMetadataHandler(MAASServerTestCase):
+    """Tests for the script metadata"""
+
+    def setUp(self):
+        super().setUp()
+        load_builtin_scripts()
+
+    def test_node_with_builtin_script_set(self):
+        node = factory.make_Node(
+            status=NODE_STATUS.DEPLOYED, with_empty_script_sets=True
+        )
+        response = make_node_client(node=node).get(
+            reverse("maas-scripts-metadata", args=["latest"])
+        )
+        self.assertEqual(
+            (http.client.OK, "application/json"),
+            (response.status_code, response["Content-Type"]),
+        )
+        body = json.loads(response.content)
+        expected_commissioning_metadata = [
+            get_script_result_properties(script_result)
+            for script_result in node.current_commissioning_script_set
+        ]
+        self.assertCountEqual(
+            expected_commissioning_metadata,
+            body["1.0"]["commissioning_scripts"],
+        )
+
+    def test_node_with_custom_commissioning_script_set(self):
+        script_name = factory.make_name("script")
+        script = factory.make_Script(
+            name=script_name, script_type=SCRIPT_TYPE.COMMISSIONING
+        )
+        node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
+        node.current_commissioning_script_set = (
+            ScriptSet.objects.create_commissioning_script_set(node)
+        )
+        node.save()
+        response = make_node_client(node=node).get(
+            reverse("maas-scripts-metadata", args=["latest"])
+        )
+        self.assertEqual(
+            (http.client.OK, "application/json"),
+            (response.status_code, response["Content-Type"]),
+        )
+        body = json.loads(response.content)
+        expected_commissioning_metadata = [
+            get_script_result_properties(script_result)
+            for script_result in node.current_commissioning_script_set
+        ]
+        self.assertCountEqual(
+            expected_commissioning_metadata,
+            body["1.0"]["commissioning_scripts"],
+        )
+        self.assertIn(
+            script.name,
+            [s["name"] for s in body["1.0"]["commissioning_scripts"]],
+        )
+
+    def test_node_with_custom_testing_script_set(self):
+        script_name = factory.make_name("script")
+        script = factory.make_Script(
+            name=script_name, script_type=SCRIPT_TYPE.TESTING
+        )
+        node = factory.make_Node(status=NODE_STATUS.COMMISSIONING)
+        node.current_testing_script_set = (
+            ScriptSet.objects.create_testing_script_set(node, scripts=[script])
+        )
+        node.save()
+        response = make_node_client(node=node).get(
+            reverse("maas-scripts-metadata", args=["latest"])
+        )
+        self.assertEqual(
+            (http.client.OK, "application/json"),
+            (response.status_code, response["Content-Type"]),
+        )
+        body = json.loads(response.content)
+        expected_testing_metadata = [
+            get_script_result_properties(script_result)
+            for script_result in node.current_testing_script_set
+        ]
+        self.assertCountEqual(
+            expected_testing_metadata, body["1.0"]["testing_scripts"]
+        )
+        self.assertIn(
+            script.name,
+            [s["name"] for s in body["1.0"]["testing_scripts"]],
+        )
+
+    def test_deployed_machine_script_set(self):
+        script_name = factory.make_name("script")
+        script = factory.make_Script(
+            name=script_name, script_type=SCRIPT_TYPE.COMMISSIONING
+        )
+        machine = factory.make_Machine(status=NODE_STATUS.DEPLOYED)
+        machine.current_commissioning_script_set = (
+            ScriptSet.objects.create_deployed_machine_script_set(machine)
+        )
+        machine.save()
+        response = make_node_client(node=machine).get(
+            reverse("maas-scripts-metadata", args=["latest"])
+        )
+        self.assertEqual(
+            (http.client.OK, "application/json"),
+            (response.status_code, response["Content-Type"]),
+        )
+        body = json.loads(response.content)
+        expected_commissioning_metadata = [
+            get_script_result_properties(script_result)
+            for script_result in machine.current_commissioning_script_set
+        ]
+        self.assertCountEqual(
+            expected_commissioning_metadata,
+            body["1.0"]["commissioning_scripts"],
+        )
+        self.assertNotIn(
+            script.name,
+            [s["name"] for s in body["1.0"]["commissioning_scripts"]],
+        )
diff --git a/src/metadataserver/tests/test_vendor_data.py b/src/metadataserver/tests/test_vendor_data.py
index 6c4000a..7c32692 100644
--- a/src/metadataserver/tests/test_vendor_data.py
+++ b/src/metadataserver/tests/test_vendor_data.py
@@ -20,6 +20,7 @@ import yaml
 
 from maasserver.enum import NODE_STATUS
 from maasserver.models import Config, ControllerInfo, NodeMetadata
+from maasserver.models.user import get_auth_tokens
 from maasserver.node_status import COMMISSIONING_LIKE_STATUSES
 from maasserver.server_address import get_maas_facing_server_host
 from maasserver.testing.factory import factory
@@ -39,6 +40,7 @@ from metadataserver.vendor_data import (
     generate_system_info,
     get_node_maas_url,
     get_vendor_data,
+    HARDWARE_SYNC_MACHINE_TOKEN_PATH,
     HARDWARE_SYNC_SERVICE_TEMPLATE,
     HARDWARE_SYNC_TIMER_TEMPLATE,
 )
@@ -710,16 +712,22 @@ class TestGenerateHardwareSyncSystemdConfiguration(MAASServerTestCase):
         self.assertRaises(StopIteration, next, config)
 
     def test_returns_timer_and_service_when_node_enable_hw_sync_is_True(self):
+        self.maxDiff = None
+        user = factory.make_admin()
+        token = get_auth_tokens(user)[0]
         node = factory.make_Node(
             status=NODE_STATUS.DEPLOYING,
+            owner=user,
             enable_hw_sync=True,
         )
         config = generate_hardware_sync_systemd_configuration(node)
         expected_interval = Config.objects.get_configs(
             ["hardware_sync_interval"]
         )
-
-        maas_url = get_node_maas_url(node)
+        expected_token = f"{token.consumer.key}:{token.key}:{token.secret}"
+        if token.consumer.secret:
+            expected_token += f":{token.consumer.secret}"
+        expected_maas_url = get_node_maas_url(node)
 
         expected = (
             "write_files",
@@ -732,7 +740,11 @@ class TestGenerateHardwareSyncSystemdConfiguration(MAASServerTestCase):
                 },
                 {
                     "content": self._get_service_template().substitute(
-                        maas_url=maas_url, architecture=node.architecture
+                        architecture=node.architecture,
+                        admin_token=expected_token,
+                        maas_url=expected_maas_url,
+                        system_id=node.system_id,
+                        token_file_path=HARDWARE_SYNC_MACHINE_TOKEN_PATH,
                     ),
                     "path": "/lib/systemd/system/maas_hardware_sync.service",
                 },
diff --git a/src/metadataserver/urls.py b/src/metadataserver/urls.py
index 0bd1f08..2e4d21d 100644
--- a/src/metadataserver/urls.py
+++ b/src/metadataserver/urls.py
@@ -17,6 +17,7 @@ from metadataserver.api import (
     EnlistVersionIndexHandler,
     IndexHandler,
     MAASScriptsHandler,
+    MAASScriptsMetadataHandler,
     MetaDataHandler,
     StatusHandler,
     UserDataHandler,
@@ -40,6 +41,9 @@ index_handler = OperationsResource(IndexHandler, authentication=api_auth)
 maas_scripts_handler = OperationsResource(
     MAASScriptsHandler, authentication=api_auth
 )
+maas_scripts_metadata_handler = OperationsResource(
+    MAASScriptsMetadataHandler, authentication=api_auth
+)
 commissioning_scripts_handler = OperationsResource(
     CommissioningScriptsHandler, authentication=api_auth
 )
@@ -90,11 +94,16 @@ node_patterns = [
     # definitive. maas-scripts is xz compressed while
     # maas-commissioning-scripts is not.
     url(
-        r"^[/]*(?P<version>[^/]+)/maas-scripts",
+        r"^[/]*(?P<version>[^/]+)/maas-scripts(?!-metadata)",
         maas_scripts_handler,
         name="maas-scripts",
     ),
     url(
+        r"^[/]*(?P<version>[^/]+)/maas-scripts-metadata",
+        maas_scripts_metadata_handler,
+        name="maas-scripts-metadata",
+    ),
+    url(
         r"^[/]*(?P<version>[^/]+)/maas-commissioning-scripts",
         commissioning_scripts_handler,
         name="commissioning-scripts",
diff --git a/src/metadataserver/user_data/templates/snippets/maas_run_scripts.py b/src/metadataserver/user_data/templates/snippets/maas_run_scripts.py
index 09e8855..cfce8e9 100644
--- a/src/metadataserver/user_data/templates/snippets/maas_run_scripts.py
+++ b/src/metadataserver/user_data/templates/snippets/maas_run_scripts.py
@@ -26,6 +26,7 @@ import yaml
 
 # imports from maas_api_helpers (only used in tests)
 # {% comment %}
+# {{if .ImportAPIHelper }}
 from snippets.maas_api_helper import (
     capture_script_output,
     Config,
@@ -38,6 +39,7 @@ from snippets.maas_api_helper import (
     signal,
 )
 
+# {{end}}
 # {% endcomment %}
 
 
@@ -186,6 +188,15 @@ class Script:
         }
 
 
+LOCAL_SCRIPTS_RUNNER = "/usr/bin/maas-hardware-sync"
+
+
+class LocalScript(Script):
+    @property
+    def command(self):
+        return [LOCAL_SCRIPTS_RUNNER, self.name]
+
+
 def oauth_token(string):
     """Helper to use as type for OAuth token commandline args."""
     try:
@@ -222,6 +233,12 @@ def parse_args(args):
         action="store_true",
         default=False,
     )
+    parser.add_argument(
+        "--local-scripts",
+        type=bool,
+        default=False,
+        help="Path to locally installed scripts, if one exists",
+    )
     subparsers = parser.add_subparsers(
         metavar="ACTION",
         dest="action",
@@ -332,6 +349,23 @@ def fetch_scripts(maas_url, metadata_url, paths, credentials):
     ]
 
 
+def load_local_scripts(maas_url, metadata_url, paths, credentials):
+    res = geturl(
+        metadata_url + "maas-scripts-metadata",
+        credentials=credentials,
+        retry=False,
+    )
+    if res.status == http.client.NO_CONTENT:
+        raise ExitError("No script returned")
+
+    data = json.load(res)
+
+    return [
+        LocalScript(script_info, maas_url, paths)
+        for script_info in data["1.0"]["commissioning_scripts"]
+    ]
+
+
 def get_machine_token(maas_url, admin_token, system_id):
     """Return a dict with machine token and MAAS URL."""
     try:
@@ -370,6 +404,41 @@ def write_token(credentials, path=None):
         print(content)
 
 
+def _action_report_results_scripts(
+    ns, maas_url, metadata_url, paths, config, script
+):
+    print(
+        f"* Running '{script.name}'...",
+        end="\n" if ns.debug else " ",
+    )
+    result = script.run(console_output=ns.debug)
+    if ns.debug:
+        print(
+            f"* Finished running '{script.name}': ",
+            end=" ",
+        )
+    if result.exit_status == 0:
+        print("success")
+    else:
+        print(
+            "FAILED (status {result.exit_status}): {result.error}".format(
+                result=result
+            )
+        )
+    signal(
+        metadata_url,
+        config.credentials,
+        result.status,
+        error=result.error,
+        script_name=script.name,
+        script_result_id=script.info.get("script_result_id"),
+        files=result.result_files,
+        runtime=result.runtime,
+        exit_status=result.exit_status,
+        script_version_id=script.info.get("script_version_id"),
+    )
+
+
 def action_report_results(ns):
     config = get_config(ns)
     if not config.metadata_url:
@@ -381,46 +450,30 @@ def action_report_results(ns):
     maas_url = get_base_url(config.metadata_url)
     metadata_url = maas_url + "/MAAS/metadata/" + MD_VERSION + "/"
 
-    print(
-        "* Fetching scripts from {url} to {dir}".format(
-            url=metadata_url, dir=paths.scripts
-        )
-    )
-    for script in fetch_scripts(
-        maas_url, metadata_url, paths, config.credentials
-    ):
-        if not script.should_run():
-            continue
-        print(
-            f"* Running '{script.name}'...",
-            end="\n" if ns.debug else " ",
-        )
-        result = script.run(console_output=ns.debug)
-        if ns.debug:
-            print(
-                f"* Finished running '{script.name}': ",
-                end=" ",
+    if ns.local_scripts:
+        print("* Fetching script metadata from {url}".format(url=metadata_url))
+        for script in load_local_scripts(
+            maas_url, metadata_url, paths, config.credentials
+        ):
+            if not script.should_run():
+                continue
+            _action_report_results_scripts(
+                ns, maas_url, metadata_url, paths, config, script
             )
-        if result.exit_status == 0:
-            print("success")
-        else:
-            print(
-                "FAILED (status {result.exit_status}): {result.error}".format(
-                    result=result
-                )
+    else:
+        print(
+            "* Fetching scripts from {url} to {dir}".format(
+                url=metadata_url, dir=paths.scripts
             )
-        signal(
-            metadata_url,
-            config.credentials,
-            result.status,
-            error=result.error,
-            script_name=script.name,
-            script_result_id=script.info.get("script_result_id"),
-            files=result.result_files,
-            runtime=result.runtime,
-            exit_status=result.exit_status,
-            script_version_id=script.info.get("script_version_id"),
         )
+        for script in fetch_scripts(
+            maas_url, metadata_url, paths, config.credentials
+        ):
+            if not script.should_run():
+                continue
+            _action_report_results_scripts(
+                ns, maas_url, metadata_url, paths, config, script
+            )
 
 
 def action_register_machine(ns):
diff --git a/src/metadataserver/user_data/templates/snippets/tests/test_maas_run_scripts.py b/src/metadataserver/user_data/templates/snippets/tests/test_maas_run_scripts.py
index ef0b3be..3823aa9 100644
--- a/src/metadataserver/user_data/templates/snippets/tests/test_maas_run_scripts.py
+++ b/src/metadataserver/user_data/templates/snippets/tests/test_maas_run_scripts.py
@@ -13,6 +13,8 @@ from provisioningserver.refresh.maas_api_helper import Credentials
 from snippets import maas_run_scripts
 from snippets.maas_run_scripts import (
     get_config,
+    LOCAL_SCRIPTS_RUNNER,
+    LocalScript,
     main,
     parse_args,
     Script,
@@ -517,3 +519,45 @@ class TestWriteToken(MAASTestCase):
             yaml.safe_load(path),
             {"reporting": {"maas": token_info}},
         )
+
+
+class TestLocalScript(MAASTestCase):
+    def test_command(self):
+        info = {
+            "name": "myscript",
+            "path": "commissioning-scripts/myscript",
+            "timeout_seconds": 100,
+        }
+        paths = ScriptsPaths(base_path=Path("/base"))
+        script = LocalScript(info, "http://maas.example.com", paths)
+        self.assertCountEqual(
+            [LOCAL_SCRIPTS_RUNNER, script.name], script.command
+        )
+
+    def test_run(self):
+        fake_process = self.patch(
+            maas_run_scripts.subprocess, "Popen"
+        ).return_value
+        mock_capture_script_output = self.patch(
+            maas_run_scripts, "capture_script_output"
+        )
+        info = {
+            "name": "myscript",
+            "path": "commissioning-scripts/myscript",
+            "timeout_seconds": 100,
+        }
+        paths = ScriptsPaths(base_path=Path("/base"))
+        script = LocalScript(info, "http://maas.example.com", paths)
+        result = script.run()
+        self.assertEqual(result.exit_status, 0)
+        self.assertEqual(result.status, "WORKING")
+        self.assertIsNone(result.error)
+        self.assertGreater(result.runtime, 0.0)
+        mock_capture_script_output.assert_called_once_with(
+            fake_process,
+            script.combined_path,
+            script.stdout_path,
+            script.stderr_path,
+            timeout_seconds=100,
+            console_output=False,
+        )
diff --git a/src/metadataserver/vendor_data.py b/src/metadataserver/vendor_data.py
index 2d17e6a..39d93c0 100644
--- a/src/metadataserver/vendor_data.py
+++ b/src/metadataserver/vendor_data.py
@@ -18,6 +18,7 @@ import yaml
 from maasserver import ntp
 from maasserver.models import Config, NodeMetadata
 from maasserver.models.controllerinfo import get_target_version
+from maasserver.models.user import get_auth_tokens
 from maasserver.node_status import COMMISSIONING_LIKE_STATUSES
 from maasserver.permissions import NodePermission
 from maasserver.preseed import get_network_yaml_settings
@@ -33,6 +34,7 @@ VIRSH_PASSWORD_METADATA_KEY = "virsh_password"
 
 HARDWARE_SYNC_TIMER_TEMPLATE = "hardware_sync_timer.template"
 HARDWARE_SYNC_SERVICE_TEMPLATE = "hardware_sync_service.template"
+HARDWARE_SYNC_MACHINE_TOKEN_PATH = "/tmp/mymachine-creds.yaml"
 
 
 def get_vendor_data(node, proxy):
@@ -389,8 +391,23 @@ def generate_hardware_sync_systemd_configuration(node):
     hardware_sync_timer = hardware_sync_timer_tmpl.substitute(
         hardware_sync_interval=hardware_sync_interval
     )
+
+    admin_token = ""
+    if node.owner is not None:
+        tokens = get_auth_tokens(node.owner)
+        if tokens:
+            admin_token = (
+                f"{tokens[0].consumer.key}:{tokens[0].key}:{tokens[0].secret}"
+            )
+            if tokens[0].consumer.secret:
+                admin_token += f":{tokens[0].consumer.secret}"
+
     hardware_sync_service = hardware_sync_service_tmpl.substitute(
-        maas_url=maas_url, architecture=node.architecture
+        architecture=node.architecture,
+        admin_token=admin_token,
+        maas_url=maas_url,
+        system_id=node.system_id,
+        token_file_path=HARDWARE_SYNC_MACHINE_TOKEN_PATH,
     )
 
     yield "write_files", [