diff --git a/internal/workloads/chaos_disk.go b/internal/workloads/chaos_disk.go index 0606358..a24635f 100644 --- a/internal/workloads/chaos_disk.go +++ b/internal/workloads/chaos_disk.go @@ -39,16 +39,12 @@ while true; do done ` -const chaosDiskSystemdUnitTemplate = `[Unit] +const chaosDiskSystemdUnit = `[Unit] Description=Virtwork chaos-disk fill/release workload After=network.target local-fs.target [Service] Type=simple -Environment="CHAOS_DISK_MOUNT=%s" -Environment="CHAOS_DISK_FILL_PERCENT=%s" -Environment="CHAOS_DISK_FILL_SLEEP=%s" -Environment="CHAOS_DISK_RELEASE_SLEEP=%s" ExecStart=/usr/local/bin/chaos-disk.sh Restart=always RestartSec=10 @@ -132,11 +128,7 @@ func (w *ChaosDiskWorkload) CloudInitUserdata() (string, error) { w.fillPercent(), w.releaseSleep(), w.fillSleep()) - unit := fmt.Sprintf(chaosDiskSystemdUnitTemplate, - mountPoint, - w.fillPercent(), - w.fillSleep(), - w.releaseSleep()) + unit := chaosDiskSystemdUnit return w.BuildCloudConfig(CloudConfigOpts{ WriteFiles: []WriteFile{ diff --git a/internal/workloads/chaos_disk_test.go b/internal/workloads/chaos_disk_test.go index b5a9dae..ed454b4 100644 --- a/internal/workloads/chaos_disk_test.go +++ b/internal/workloads/chaos_disk_test.go @@ -219,10 +219,8 @@ var _ = Describe("ChaosDiskWorkload", func() { Expect(scriptContent).To(ContainSubstring(`FILL_SLEEP="60"`)) Expect(scriptContent).To(ContainSubstring(`RELEASE_SLEEP="30"`)) - Expect(unitContent).To(ContainSubstring("CHAOS_DISK_MOUNT=/mnt/data")) - Expect(unitContent).To(ContainSubstring("CHAOS_DISK_FILL_PERCENT=90")) - Expect(unitContent).To(ContainSubstring("CHAOS_DISK_FILL_SLEEP=60")) - Expect(unitContent).To(ContainSubstring("CHAOS_DISK_RELEASE_SLEEP=30")) + Expect(unitContent).NotTo(ContainSubstring("Environment=")) + Expect(unitContent).To(ContainSubstring("ExecStart=/usr/local/bin/chaos-disk.sh")) Expect(setupContent).To(ContainSubstring("/mnt/data")) }) @@ -265,10 +263,8 @@ var _ = Describe("ChaosDiskWorkload", func() { Expect(scriptContent).To(ContainSubstring(`FILL_SLEEP="120"`)) Expect(scriptContent).To(ContainSubstring(`RELEASE_SLEEP="45"`)) - Expect(unitContent).To(ContainSubstring("CHAOS_DISK_MOUNT=/data")) - Expect(unitContent).To(ContainSubstring("CHAOS_DISK_FILL_PERCENT=75")) - Expect(unitContent).To(ContainSubstring("CHAOS_DISK_FILL_SLEEP=120")) - Expect(unitContent).To(ContainSubstring("CHAOS_DISK_RELEASE_SLEEP=45")) + Expect(unitContent).NotTo(ContainSubstring("Environment=")) + Expect(unitContent).To(ContainSubstring("ExecStart=/usr/local/bin/chaos-disk.sh")) Expect(setupContent).To(ContainSubstring("/data")) })