From f07aa004128901808d83e8e4b70e5a8b6ffb13cc Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 13:00:34 -0400 Subject: [PATCH 01/38] add user prefix that is ignored by git so users can customize --- .gitignore | 7 +++ Makefile | 156 ++++++++++++++++++++++++++--------------------------- 2 files changed, 85 insertions(+), 78 deletions(-) diff --git a/.gitignore b/.gitignore index d2d54406..b5e797bb 100644 --- a/.gitignore +++ b/.gitignore @@ -12,3 +12,10 @@ Makefile.local rspec_html_reports .DS_Store +*.*.json +floppy/*.*.cmd +floppy/*.*.bat +floppy/*.*.ps1 +floppy/*.*.cfg +floppy/*.*.zip +floppy/*.*.vbs diff --git a/Makefile b/Makefile index fc505b67..bb42d88e 100644 --- a/Makefile +++ b/Makefile @@ -148,117 +148,117 @@ define SHORTCUT ifeq ($(UNAME_S),Darwin) -$(1): $(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +$(PREFIX)$(1): $(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -$(1)-cygwin: $(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +$(PREFIX)$(1)-cygwin: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -$(1)-ssh: $(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +$(PREFIX)$(1)-ssh: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-$(1): test-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-$(PREFIX)$(1): test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-$(PREFIX)$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-$(PREFIX)$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -s3cp-$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) s3cp-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-$(PREFIX)$(1): s3cp-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) s3cp-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) else -$(1): $(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +$(PREFIX)$(1): $(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -$(1)-cygwin: $(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +$(PREFIX)$(1)-cygwin: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -$(1)-ssh: $(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +$(PREFIX)$(1)-ssh: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-$(1): test-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-$(PREFIX)$(1): test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-$(PREFIX)$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-$(PREFIX)$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -s3cp-$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-$(PREFIX)$(1): s3cp-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) s3cp-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) endif -vmware/$(1): $(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) +vmware/$(PREFIX)$(1): $(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -vmware/$(1)-cygwin: $(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +vmware/$(PREFIX)$(1)-cygwin: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -vmware/$(1)-ssh: $(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +vmware/$(PREFIX)$(1)-ssh: $(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -virtualbox/$(1): $(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +virtualbox/$(PREFIX)$(1): $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -virtualbox/$(1)-cygwin: $(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +virtualbox/$(PREFIX)$(1)-cygwin: $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -virtualbox/$(1)-ssh: $(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +virtualbox/$(PREFIX)$(1)-ssh: $(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -parallels/$(1): $(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +parallels/$(PREFIX)$(1): $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -parallels/$(1)-cygwin: $(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +parallels/$(PREFIX)$(1)-cygwin: $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -parallels/$(1)-ssh: $(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +parallels/$(PREFIX)$(1)-ssh: $(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -hyperv/$(1): $(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX) +hyperv/$(PREFIX)$(1): $(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -hyperv/$(1)-cygwin: $(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +hyperv/$(PREFIX)$(1)-cygwin: $(HYPERV_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -hyperv/$(1)-ssh: $(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +hyperv/$(PREFIX)$(1)-ssh: $(HYPERV_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-vmware/$(1): test-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-vmware/$(PREFIX)$(1): test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-vmware/$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-vmware/$(PREFIX)$(1)-cygwin: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-vmware/$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-vmware/$(PREFIX)$(1)-ssh: test-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-virtualbox/$(1): test-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-virtualbox/$(PREFIX)$(1): test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-virtualbox/$(1)-cygwin: test-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-virtualbox/$(PREFIX)$(1)-cygwin: test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-virtualbox/$(1)-ssh: test-$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-virtualbox/$(PREFIX)$(1)-ssh: test-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-parallels/$(1): test-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-parallels/$(PREFIX)$(1): test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-parallels/$(1)-cygwin: test-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-parallels/$(PREFIX)$(1)-cygwin: test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-parallels/$(1)-ssh: test-$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-parallels/$(PREFIX)$(1)-ssh: test-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -test-hyperv/$(1): test-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX) +test-hyperv/$(PREFIX)$(1): test-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -test-hyperv/$(1)-cygwin: test-$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +test-hyperv/$(PREFIX)$(1)-cygwin: test-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -test-hyperv/$(1)-ssh: test-$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +test-hyperv/$(PREFIX)$(1)-ssh: test-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -ssh-vmware/$(1): ssh-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) +ssh-vmware/$(PREFIX)$(1): ssh-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -ssh-vmware/$(1)-cygwin: ssh-$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +ssh-vmware/$(PREFIX)$(1)-cygwin: ssh-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -ssh-vmware/$(1)-ssh: ssh-$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +ssh-vmware/$(PREFIX)$(1)-ssh: ssh-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -ssh-virtualbox/$(1): ssh-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +ssh-virtualbox/$(PREFIX)$(1): ssh-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -ssh-virtualbox/$(1)-cygwin: ssh-$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +ssh-virtualbox/$(PREFIX)$(1)-cygwin: ssh-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -ssh-virtualbox/$(1)-ssh: ssh-$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +ssh-virtualbox/$(PREFIX)$(1)-ssh: ssh-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -ssh-parallels/$(1): ssh-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +ssh-parallels/$(PREFIX)$(1): ssh-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -ssh-parallels/$(1)-cygwin: ssh-$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +ssh-parallels/$(PREFIX)$(1)-cygwin: ssh-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -ssh-parallels/$(1)-ssh: ssh-$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +ssh-parallels/$(PREFIX)$(1)-ssh: ssh-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -ssh-hyperv/$(1): ssh-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX) +ssh-hyperv/$(PREFIX)$(1): ssh-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -ssh-hyperv/$(1)-cygwin: ssh-$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX) +ssh-hyperv/$(PREFIX)$(1)-cygwin: ssh-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX) -ssh-hyperv/$(1)-ssh: ssh-$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX) +ssh-hyperv/$(PREFIX)$(1)-ssh: ssh-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX) -s3cp-vmware/$(1): s3cp-$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-vmware/$(PREFIX)$(1): s3cp-$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -s3cp-virtualbox/$(1): s3cp-$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-virtualbox/$(PREFIX)$(1): s3cp-$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -s3cp-parallels/$(1): s3cp-$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-parallels/$(PREFIX)$(1): s3cp-$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) -s3cp-hyperv/$(1): s3cp-$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX) +s3cp-hyperv/$(PREFIX)$(1): s3cp-$(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX) endef SHORTCUT_TARGETS := $(basename $(TEMPLATE_FILENAMES)) @@ -402,65 +402,65 @@ test-eval-openssh: test-eval-win2012r2-datacenter test-eval-win2008r2-datacenter define BUILDBOX -$(VIRTUALBOX_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json +$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX): $(PREFIX)$(1).json rm -rf $(VIRTUALBOX_OUTPUT) mkdir -p $(VIRTUALBOX_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1).json -$(VMWARE_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json +$(VMWARE_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX): $(PREFIX)$(1).json rm -rf $(VMWARE_OUTPUT) mkdir -p $(VMWARE_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1).json -$(PARALLELS_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json +$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX): $(PREFIX)$(1).json rm -rf $(PARALLELS_OUTPUT) mkdir -p $(PARALLELS_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1).json -$(HYPERV_BOX_DIR)/$(1)$(BOX_SUFFIX): $(1).json +$(HYPERV_BOX_DIR)/$(PREFIX)$(1)$(BOX_SUFFIX): $(PREFIX)$(1).json rm -rf $(HYPERV_OUTPUT) mkdir -p $(HYPERV_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1).json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1).json -$(VIRTUALBOX_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json +$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX): $(PREFIX)$(1)-ssh.json rm -rf $(VIRTUALBOX_OUTPUT) mkdir -p $(VIRTUALBOX_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-ssh.json -$(VMWARE_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json +$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX): $(PREFIX)$(1)-ssh.json rm -rf $(VMWARE_OUTPUT) mkdir -p $(VMWARE_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json + $(PACKER) build -on-error=$(ON_ERROR) -only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-ssh.json -$(PARALLELS_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json +$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX): $(PREFIX)$(1)-ssh.json rm -rf $(PARALLELS_OUTPUT) mkdir -p $(PARALLELS_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-ssh.json -$(HYPERV_BOX_DIR)/$(1)-ssh$(BOX_SUFFIX): $(1)-ssh.json +$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-ssh$(BOX_SUFFIX): $(PREFIX)$(1)-ssh.json rm -rf $(HYPERV_OUTPUT) mkdir -p $(HYPERV_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-ssh.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-ssh.json -$(VIRTUALBOX_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json +$(VIRTUALBOX_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX): $(PREFIX)$(1)-cygwin.json rm -rf $(VIRTUALBOX_OUTPUT) mkdir -p $(VIRTUALBOX_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(VIRTUALBOX_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-cygwin.json -$(VMWARE_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json +$(VMWARE_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX): $(PREFIX)$(1)-cygwin.json rm -rf $(VMWARE_OUTPUT) mkdir -p $(VMWARE_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(VMWARE_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-cygwin.json -$(PARALLELS_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json +$(PARALLELS_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX): $(PREFIX)$(1)-cygwin.json rm -rf $(PARALLELS_OUTPUT) mkdir -p $(PARALLELS_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(PARALLELS_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-cygwin.json -$(HYPERV_BOX_DIR)/$(1)-cygwin$(BOX_SUFFIX): $(1)-cygwin.json +$(HYPERV_BOX_DIR)/$(PREFIX)$(1)-cygwin$(BOX_SUFFIX): $(PREFIX)$(1)-cygwin.json rm -rf $(HYPERV_OUTPUT) mkdir -p $(HYPERV_BOX_DIR) - $(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(1)-cygwin.json + $(PACKER) build -on-error=$(ON_ERROR) --only=$(HYPERV_BUILDER) $(PACKER_VARS) -var "iso_url=$(2)" -var "iso_checksum=$(3)" $(PREFIX)$(1)-cygwin.json endef $(eval $(call BUILDBOX,win2008r2-datacenter,$(WIN2008R2_X64),$(WIN2008R2_X64_CHECKSUM))) From bf7ef79f5902ab9e362f2cb2f4f81fc76c87561b Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 13:04:07 -0400 Subject: [PATCH 02/38] remove "VBoxInternal/CPUM/CMPXCHG16B due to error on build --- eval-win10x64-enterprise.json | 1 - win2012r2-standard.json | 1 - 2 files changed, 2 deletions(-) diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index 4b563843..a65840e5 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -77,7 +77,6 @@ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", "1" ] ], diff --git a/win2012r2-standard.json b/win2012r2-standard.json index c18197c7..787860c7 100644 --- a/win2012r2-standard.json +++ b/win2012r2-standard.json @@ -66,7 +66,6 @@ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", "1" ] ], From 83431fd7bee1a104d6cc07b31e859eb976bc8cfe Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 13:21:02 -0400 Subject: [PATCH 03/38] add HideWirelessSetupInOOBE & HideOnlineAccountScreens --- floppy/eval-win10x64-enterprise/Autounattend.xml | 2 ++ floppy/eval-win10x86-enterprise/Autounattend.xml | 2 ++ 2 files changed, 4 insertions(+) diff --git a/floppy/eval-win10x64-enterprise/Autounattend.xml b/floppy/eval-win10x64-enterprise/Autounattend.xml index 56867f6c..c329178d 100644 --- a/floppy/eval-win10x64-enterprise/Autounattend.xml +++ b/floppy/eval-win10x64-enterprise/Autounattend.xml @@ -117,6 +117,8 @@ Work 3 true + true + true diff --git a/floppy/eval-win10x86-enterprise/Autounattend.xml b/floppy/eval-win10x86-enterprise/Autounattend.xml index 7a414603..6acab4e4 100644 --- a/floppy/eval-win10x86-enterprise/Autounattend.xml +++ b/floppy/eval-win10x86-enterprise/Autounattend.xml @@ -92,6 +92,8 @@ true Work 3 + true + true From 874dc7322fb603b8271345486d21bbbc338c1e26 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 13:22:19 -0400 Subject: [PATCH 04/38] add/use :ps1_download function with proxy support to/from _packer_config.cmd --- floppy/00-run-all-scripts.cmd | 4 ++++ floppy/01-install-wget.cmd | 6 +----- floppy/_download.cmd | 2 +- floppy/_packer_config.cmd | 27 +++++++++++++++++++++++++++ floppy/_post_update_install.bat | 2 +- floppy/cygwin.bat | 3 +-- floppy/hotfix-KB2842230.bat | 4 ++-- floppy/openssh.bat | 3 +-- floppy/zz-start-transports.cmd | 2 +- script/01-install-handle.cmd | 3 +-- script/cmtool.bat | 11 ++++------- script/ultradefrag.bat | 6 ++---- script/vagrant.bat | 3 +-- script/vmtool.bat | 12 +++++------- 14 files changed, 52 insertions(+), 36 deletions(-) diff --git a/floppy/00-run-all-scripts.cmd b/floppy/00-run-all-scripts.cmd index 3ed89f58..9a92d74d 100644 --- a/floppy/00-run-all-scripts.cmd +++ b/floppy/00-run-all-scripts.cmd @@ -2,6 +2,10 @@ @for %%i in (%~dp0\_packer_config*.cmd) do @call "%%~i" @if defined PACKER_DEBUG (@echo on) else (@echo off) +if exist %~dp0\_packer_config*.cmd ( + copy %~dp0\_packer_config.cmd "%SystemRoot%\" +) + goto main :::::::::::: diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index c33f0f48..2738e6b8 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -20,11 +20,7 @@ if exist "%filename%" goto exit0 :_download_cmd_not_found -echo ==^> Downloading "%WGET_URL%" to "%filename%" - -:powershell - -powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%WGET_URL%', '%filename%')" Downloading "%url%" to "%filename%" + + if defined http_proxy ( + if defined no_proxy ( + set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" + ) else ( + set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" + ) + ) else ( + set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" + ) + + powershell -command %ps1_script% >nul + exit /b + + diff --git a/floppy/_post_update_install.bat b/floppy/_post_update_install.bat index a682d3cb..7fe9a5cd 100644 --- a/floppy/_post_update_install.bat +++ b/floppy/_post_update_install.bat @@ -9,7 +9,7 @@ REM want to run scripts following all updates/reboots. title Running post update scripts. Please wait... @for %%i in (%~dp0\zz*.cmd) do ( - echo ==^> Running "%%~i" + echo ==^> Running "%%~i" @call "%%~i" ) diff --git a/floppy/cygwin.bat b/floppy/cygwin.bat index f950488f..db669284 100644 --- a/floppy/cygwin.bat +++ b/floppy/cygwin.bat @@ -34,8 +34,7 @@ pushd "%CYGWIN_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%CYGWIN_URL%" "%CYGWIN_PATH%" ) else ( - echo ==^> Downloading "%CYGWIN_URL%" to "%CYGWIN_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%CYGWIN_URL%', '%CYGWIN_PATH%')" Downloading "%HOTFIX_2842230_URL%" to "%HOTFIX_2842230_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%HOTFIX_2842230_URL%', '%HOTFIX_2842230_PATH%')" Extracting Hotfix KB2842230 diff --git a/floppy/openssh.bat b/floppy/openssh.bat index cec19dc0..14f2007e 100644 --- a/floppy/openssh.bat +++ b/floppy/openssh.bat @@ -18,8 +18,7 @@ pushd "%OPENSSH_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%OPENSSH_URL%" "%OPENSSH_PATH%" ) else ( - echo ==^> Downloading "%OPENSSH_URL%" to "%OPENSSH_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%OPENSSH_URL%', '%OPENSSH_PATH%')" nul 2>nul && ( echo ==^> Configuring %%i service to autostart sc config %%i start= auto - + echo ==^> Starting the %%i service sc start %%i ) diff --git a/script/01-install-handle.cmd b/script/01-install-handle.cmd index c13cae58..381f305a 100644 --- a/script/01-install-handle.cmd +++ b/script/01-install-handle.cmd @@ -15,8 +15,7 @@ pushd "%HANDLE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%HANDLE_URL%" "%HANDLE_PATH%" ) else ( - echo ==^> Downloading "%HANDLE_URL%" to "%HANDLE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%HANDLE_URL%', '%HANDLE_PATH%')" Downloading %CHEF_URL% to %CHEF_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile(\"%CHEF_URL%\", '%CHEF_PATH%')" Downloading Chef DK to %CHEFDK_PATH% if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%CHEFDK_URL%" "%CHEFDK_PATH%" ) else ( - echo ==^> Downloading %CHEFDK_URL% to %CHEFDK_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile(\"%CHEFDK_URL%\", '%CHEFDK_PATH%')" Downloading %PUPPET_URL% to %PUPPET_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%PUPPET_URL%', '%PUPPET_PATH%')" Downloading %SALT_URL% to %SALT_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" Downloading "%SEVENZIP_URL%" to "%SEVENZIP_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SEVENZIP_URL%', '%SEVENZIP_PATH%')" Downloading "%ULTRADEFRAG_URL%" to "%ULTRADEFRAG_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%ULTRADEFRAG_URL%', '%ULTRADEFRAG_PATH%')" Downloading "%VAGRANT_PUB_URL%" to "%VAGRANT_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VAGRANT_PUB_URL%', '%VAGRANT_PATH%')" Downloading "%SEVENZIP_URL%" to "%SEVENZIP_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SEVENZIP_URL%', '%SEVENZIP_PATH%')" Installing "%SEVENZIP_PATH%" @@ -127,8 +126,7 @@ if defined VMWARE_TOOLS_ISO_PATH goto install_vmware_tools_from_iso if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" ) else ( - echo ==^> Downloading "%VMWARE_TOOLS_TAR_URL%" to "%VMWARE_TOOLS_TAR_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VMWARE_TOOLS_TAR_URL%', '%VMWARE_TOOLS_TAR_PATH%')" Installing VMware tools "%VMWARE_TOOLS_SETUP_PATH%" /S /v "/qn REBOOT=R ADDLOCAL=ALL" @if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%VMWARE_TOOLS_SETUP_PATH%" /S /v "/qn REBOOT=R ADDLOCAL=ALL" ver>nul -goto exit0 +goto :exit0 :::::::::::: :virtualbox @@ -203,8 +201,7 @@ if %_VBOX_ISO_SIZE% GTR 0 goto install_vbox_guest_additions_from_iso if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%" ) else ( - echo ==^> Downloading "%VBOX_ISO_URL%" to "%VBOX_ISO_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%VBOX_ISO_URL%', '%VBOX_ISO_PATH%')" nul @goto :exit From 320ba20e311657d9481a6c5958a4f83975515c5c Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 14:00:03 -0400 Subject: [PATCH 05/38] add user prefix that is ignored by git so users can customize --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/.gitignore b/.gitignore index b5e797bb..f7ccae87 100644 --- a/.gitignore +++ b/.gitignore @@ -19,3 +19,9 @@ floppy/*.*.ps1 floppy/*.*.cfg floppy/*.*.zip floppy/*.*.vbs +script/*.*.cmd +script/*.*.bat +script/*.*.ps1 +script/*.*.cfg +script/*.*.zip +script/*.*.vbs From 6b4059252a8bace77c65ff685d189e7fb7df7f42 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 14:41:19 -0400 Subject: [PATCH 06/38] cleanup --- floppy/00-run-all-scripts.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/floppy/00-run-all-scripts.cmd b/floppy/00-run-all-scripts.cmd index 9a92d74d..5436c771 100644 --- a/floppy/00-run-all-scripts.cmd +++ b/floppy/00-run-all-scripts.cmd @@ -2,7 +2,7 @@ @for %%i in (%~dp0\_packer_config*.cmd) do @call "%%~i" @if defined PACKER_DEBUG (@echo on) else (@echo off) -if exist %~dp0\_packer_config*.cmd ( +if exist %~dp0\_packer_config.cmd ( copy %~dp0\_packer_config.cmd "%SystemRoot%\" ) From 4740098d339bb49a3716c9286e79be84ea0435be Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 14:43:08 -0400 Subject: [PATCH 07/38] cleanup --- floppy/_packer_config.cmd | 1 + 1 file changed, 1 insertion(+) diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index f5f822b7..40fe7b79 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -1,5 +1,6 @@ @echo off +:: Calls functions with args from this file below. if not "%~1" == "" ( call :%* ) From 1328828a92a4d56238c39828c2dd2c8af39dfe2d Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 14:56:57 -0400 Subject: [PATCH 08/38] cleanup --- floppy/eval-win10x64-enterprise/Autounattend.xml | 1 - floppy/eval-win10x86-enterprise/Autounattend.xml | 1 - 2 files changed, 2 deletions(-) diff --git a/floppy/eval-win10x64-enterprise/Autounattend.xml b/floppy/eval-win10x64-enterprise/Autounattend.xml index c329178d..7d69e435 100644 --- a/floppy/eval-win10x64-enterprise/Autounattend.xml +++ b/floppy/eval-win10x64-enterprise/Autounattend.xml @@ -117,7 +117,6 @@ Work 3 true - true true diff --git a/floppy/eval-win10x86-enterprise/Autounattend.xml b/floppy/eval-win10x86-enterprise/Autounattend.xml index 6acab4e4..22bf5ddb 100644 --- a/floppy/eval-win10x86-enterprise/Autounattend.xml +++ b/floppy/eval-win10x86-enterprise/Autounattend.xml @@ -92,7 +92,6 @@ true Work 3 - true true From 061812e75b69886e895f81a3be09b1e39095fa14 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 15:13:16 -0400 Subject: [PATCH 09/38] add disable bits so scripts can fail if we want them to --- floppy/01-install-wget.cmd | 4 +++- floppy/_download.cmd | 4 ++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index 2738e6b8..7003d981 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -24,7 +24,9 @@ call _packer_config.cmd ps1_download "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 -set bitsadmin= +if defined USE_BITS ( + if "%USE_BITS%" == "false" if not exist "%filename%" goto exit1 +)set bitsadmin= for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 537fecbc..3b9d62e4 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -58,6 +58,10 @@ call _packer_config.cmd ps1_download "%filename%" "%url%" if not errorlevel 1 if exist "%filename%" goto exit0 +if defined USE_BITS ( + if "%USE_BITS%" == "false" if not exist "%filename%" goto exit1 +) + :bitsadmin set bitsadmin= From 8ddc5f8b0dffaac9f163e530400849d56899036b Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 21 Mar 2019 15:18:56 -0400 Subject: [PATCH 10/38] add disable bits so scripts can fail if we want them to --- floppy/01-install-wget.cmd | 6 ++++-- floppy/_download.cmd | 2 +- floppy/_packer_config.cmd | 4 ++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index 7003d981..db5d6104 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -25,8 +25,10 @@ call _packer_config.cmd ps1_download "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 if defined USE_BITS ( - if "%USE_BITS%" == "false" if not exist "%filename%" goto exit1 -)set bitsadmin= + if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 +) + +set bitsadmin= for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 3b9d62e4..4add7976 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -59,7 +59,7 @@ call _packer_config.cmd ps1_download "%filename%" "%url%" if not errorlevel 1 if exist "%filename%" goto exit0 if defined USE_BITS ( - if "%USE_BITS%" == "false" if not exist "%filename%" goto exit1 + if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 ) :bitsadmin diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index 40fe7b79..eb7037f1 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -13,6 +13,10 @@ if not "%~1" == "" ( :: Default: (unset) :: set PACKER_DEBUG=1 +:: Uncomment to disable BITS so scripts can fail instead of hanging. +:: Default: (unset) +:: set DISABLE_BITS=1 + :: Uncomment the following to define the directory where scripts/save-logs.cmd :: will save the installation logs :: Default: z:\c\packer_logs From bcb64253974977b8dd344309d8f8b7682906611e Mon Sep 17 00:00:00 2001 From: Dax T Games Date: Sat, 23 Mar 2019 05:01:43 -0400 Subject: [PATCH 11/38] Update .gitignore --- .gitignore | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index f7ccae87..c0f9bf7c 100644 --- a/.gitignore +++ b/.gitignore @@ -13,15 +13,5 @@ rspec_html_reports .DS_Store *.*.json -floppy/*.*.cmd -floppy/*.*.bat -floppy/*.*.ps1 -floppy/*.*.cfg -floppy/*.*.zip -floppy/*.*.vbs -script/*.*.cmd -script/*.*.bat -script/*.*.ps1 -script/*.*.cfg -script/*.*.zip -script/*.*.vbs +floppy/*.*.* +script/*.*.* From 3e6de6f08718dcf9efab84cf79a7d426669f1b32 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Sat, 23 Mar 2019 05:26:06 -0400 Subject: [PATCH 12/38] cleanup --- script/clean.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/clean.bat b/script/clean.bat index 6a71e9d9..bf97cf5f 100644 --- a/script/clean.bat +++ b/script/clean.bat @@ -35,6 +35,9 @@ echo ==^> Cleaning "%SystemRoot%\TEMP" files >&2 for %%i in ("%SystemRoot%\TEMP\*.*") do if /i not "%%~nxi" equ "%~nx0" echo del /f /q /s "%%~i" +echo ==^> Cleaning "%SystemRoot%\_packer_config.cmd" file >&2 +del /f /q /s "%SystemRoot%\_packer_config.cmd" + echo ==^> Removing potentially corrupt recycle bin :: see http://www.winhelponline.com/blog/fix-corrupted-recycle-bin-windows-7-vista/ rmdir /q /s %SystemDrive%\$Recycle.bin From 497b26fbe2bd7aef1a6a43f72983943dc1dc1a2c Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 25 Apr 2019 11:38:20 -0400 Subject: [PATCH 13/38] fix --- floppy/01-install-wget.cmd | 2 +- floppy/_download.cmd | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index db5d6104..ffc1d336 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -24,7 +24,7 @@ call _packer_config.cmd ps1_download "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 -if defined USE_BITS ( +if defined DISABLE_BITS ( if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 ) diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 4add7976..47659cf5 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -58,7 +58,7 @@ call _packer_config.cmd ps1_download "%filename%" "%url%" if not errorlevel 1 if exist "%filename%" goto exit0 -if defined USE_BITS ( +if defined DISABLE_BITS ( if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 ) From dde466aaf16950eea271f15c4eecf28e7580ab09 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 20 Feb 2020 09:04:23 -0500 Subject: [PATCH 14/38] spacing --- Makefile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Makefile b/Makefile index 816a3507..d2cbf6d0 100644 --- a/Makefile +++ b/Makefile @@ -73,6 +73,8 @@ ifndef CM_VERSION CM_VERSION = latest endif endif + + BOX_VERSION ?= $(shell cat VERSION) UPDATE ?= false GENERALIZE ?= false From b728f7e52788ef5ad056c45d871bc069d76f8f2f Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 20 Feb 2020 09:13:18 -0500 Subject: [PATCH 15/38] update Makefile to allow disable bits --- Makefile | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/Makefile b/Makefile index d2cbf6d0..e304ac6b 100644 --- a/Makefile +++ b/Makefile @@ -74,6 +74,10 @@ ifndef CM_VERSION endif endif +DISABLE_BITS ?= +ifndef DISABLE_BITS + DISABLE_BITS = false +endif BOX_VERSION ?= $(shell cat VERSION) UPDATE ?= false @@ -102,6 +106,9 @@ endif ifdef CM_VERSION PACKER_VARS += -var 'cm_version=$(CM_VERSION)' endif +ifdef DISABLE_BITS + PACKER_VARS += -var 'disable_bits=$(DISABLE_BITS)' +endif ON_ERROR ?= cleanup PACKER ?= packer ifdef PACKER_DEBUG From 71013de0215412936be0626bcb1f9391c05ac27e Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 20 Feb 2020 09:17:46 -0500 Subject: [PATCH 16/38] disable bits --- floppy/01-install-wget.cmd | 4 ++++ floppy/_download.cmd | 4 ++++ 2 files changed, 8 insertions(+) diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index c33f0f48..4087ed2a 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -28,6 +28,10 @@ powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%WGET_URL%' if exist "%filename%" goto exit0 +if defined DISABLE_BITS ( + if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 +) + set bitsadmin= for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 434b0f83..9083b1f3 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -58,6 +58,10 @@ powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%url%', '%f if not errorlevel 1 if exist "%filename%" goto exit0 +if defined DISABLE_BITS ( + if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 +) + :bitsadmin set bitsadmin= From dca90a33ceb1b12e985eea7e91af9027d3fe24d6 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 20 Feb 2020 09:48:43 -0500 Subject: [PATCH 17/38] disable bits --- Makefile | 8 -------- floppy/_packer_config.cmd | 5 +++++ 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/Makefile b/Makefile index e304ac6b..5c1e90d1 100644 --- a/Makefile +++ b/Makefile @@ -74,11 +74,6 @@ ifndef CM_VERSION endif endif -DISABLE_BITS ?= -ifndef DISABLE_BITS - DISABLE_BITS = false -endif - BOX_VERSION ?= $(shell cat VERSION) UPDATE ?= false GENERALIZE ?= false @@ -106,9 +101,6 @@ endif ifdef CM_VERSION PACKER_VARS += -var 'cm_version=$(CM_VERSION)' endif -ifdef DISABLE_BITS - PACKER_VARS += -var 'disable_bits=$(DISABLE_BITS)' -endif ON_ERROR ?= cleanup PACKER ?= packer ifdef PACKER_DEBUG diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index e18ca80d..f34c87ea 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -13,6 +13,11 @@ :: Default: z:\c\packer_logs :: set PACKER_LOG_DIR=z:\c\packer_logs +:: Uncomment to disable BITS so scripts can fail instead of hanging when +:: BITS doesn't work right. +:: Default: (unset) +:: set DISABLE_BITS=1 + :: Uncomment the following to change the pagefile size in MB as set by :: floppy/pagefile.bat :: Default: 512 From 5dd855aef99d972ae503e6cb317b11d45d4044c1 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Thu, 20 Feb 2020 09:52:54 -0500 Subject: [PATCH 18/38] disable bits --- floppy/_packer_config.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index f34c87ea..6ede89e2 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -13,7 +13,7 @@ :: Default: z:\c\packer_logs :: set PACKER_LOG_DIR=z:\c\packer_logs -:: Uncomment to disable BITS so scripts can fail instead of hanging when +:: Uncomment the following to disable BITS so scripts can fail instead of hanging when :: BITS doesn't work right. :: Default: (unset) :: set DISABLE_BITS=1 From c21e0e56a3c2f10453465f776f26cdbee70e9393 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 11:24:14 -0500 Subject: [PATCH 19/38] _download_ps1.cmd --- floppy/00-run-all-scripts.cmd | 6 ++--- floppy/_download_ps1.cmd | 17 ++++++++++++++ floppy/_packer_config.cmd | 44 +++++++++++++++++------------------ script/clean.bat | 4 ++-- 4 files changed, 44 insertions(+), 27 deletions(-) create mode 100644 floppy/_download_ps1.cmd diff --git a/floppy/00-run-all-scripts.cmd b/floppy/00-run-all-scripts.cmd index 5436c771..c6709e34 100644 --- a/floppy/00-run-all-scripts.cmd +++ b/floppy/00-run-all-scripts.cmd @@ -2,9 +2,9 @@ @for %%i in (%~dp0\_packer_config*.cmd) do @call "%%~i" @if defined PACKER_DEBUG (@echo on) else (@echo off) -if exist %~dp0\_packer_config.cmd ( - copy %~dp0\_packer_config.cmd "%SystemRoot%\" -) +REM if exist %~dp0\_packer_config.cmd ( +REM copy %~dp0\_packer_config.cmd "%SystemRoot%\" +REM ) goto main diff --git a/floppy/_download_ps1.cmd b/floppy/_download_ps1.cmd new file mode 100644 index 00000000..0a6ebb27 --- /dev/null +++ b/floppy/_download_ps1.cmd @@ -0,0 +1,17 @@ +set url=%~1 +set filename=%~2 + +echo ==^> Downloading "%url%" to "%filename%" + +if defined http_proxy ( + if defined no_proxy ( + set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" + ) else ( + set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" + ) +) else ( + set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" +) + +powershell -command %ps1_script% >nul +exit /b diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index eb7037f1..dc41e1a8 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -1,9 +1,9 @@ @echo off -:: Calls functions with args from this file below. -if not "%~1" == "" ( - call :%* -) +REM :: Calls functions with args from this file below. +REM if not "%~1" == "" ( +REM call :%* +REM ) :: Uncomment the following to set a different Cygwin mirror :: Default: http://mirrors.kernel.org/sourceware/cygwin @@ -58,23 +58,23 @@ set PACKER_SERVICES=opensshd sshd BvSshServer winrm exit /b -:ps1_download - set url=%~1 - set filename=%~2 - - echo ==^> Downloading "%url%" to "%filename%" - - if defined http_proxy ( - if defined no_proxy ( - set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" - ) else ( - set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" - ) - ) else ( - set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" - ) - - powershell -command %ps1_script% >nul - exit /b +REM :ps1_download +REM set url=%~1 +REM set filename=%~2 +REM +REM echo ==^> Downloading "%url%" to "%filename%" +REM +REM if defined http_proxy ( +REM if defined no_proxy ( +REM set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" +REM ) else ( +REM set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" +REM ) +REM ) else ( +REM set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" +REM ) +REM +REM powershell -command %ps1_script% >nul +REM exit /b diff --git a/script/clean.bat b/script/clean.bat index bf97cf5f..ff7c006c 100644 --- a/script/clean.bat +++ b/script/clean.bat @@ -35,8 +35,8 @@ echo ==^> Cleaning "%SystemRoot%\TEMP" files >&2 for %%i in ("%SystemRoot%\TEMP\*.*") do if /i not "%%~nxi" equ "%~nx0" echo del /f /q /s "%%~i" -echo ==^> Cleaning "%SystemRoot%\_packer_config.cmd" file >&2 -del /f /q /s "%SystemRoot%\_packer_config.cmd" +REM echo ==^> Cleaning "%SystemRoot%\_packer_config.cmd" file >&2 +REM del /f /q /s "%SystemRoot%\_packer_config.cmd" echo ==^> Removing potentially corrupt recycle bin :: see http://www.winhelponline.com/blog/fix-corrupted-recycle-bin-windows-7-vista/ From b932ad26f2b65d72b0907c7d732ab0dfd0c3da1b Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 12:27:31 -0500 Subject: [PATCH 20/38] remove _download_ps1.cmd --- floppy/01-install-wget.cmd | 3 ++- floppy/_download.cmd | 14 +++++++++++++- floppy/_download_ps1.cmd | 17 ----------------- floppy/_packer_config.cmd | 26 -------------------------- floppy/cygwin.bat | 2 +- floppy/hotfix-KB2842230.bat | 2 +- floppy/openssh.bat | 2 +- script/01-install-handle.cmd | 2 +- script/cmtool.bat | 8 ++++---- script/ultradefrag.bat | 4 ++-- script/vmtool.bat | 6 +++--- 11 files changed, 28 insertions(+), 58 deletions(-) delete mode 100644 floppy/_download_ps1.cmd diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index ffc1d336..8268ea28 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -13,6 +13,7 @@ for %%i in ("%WGET_URL%") do set filename=%SystemRoot%\%%~nxi if not exist "%~dp0\_download.cmd" goto _download_cmd_not_found copy /y "%~dp0\_download.cmd" "%SystemRoot%\" +copy /y "%~dp0\_download_ps1.cmd" "%SystemRoot%\" call "%~dp0\_download.cmd" "%WGET_URL%" "%filename%" @@ -20,7 +21,7 @@ if exist "%filename%" goto exit0 :_download_cmd_not_found -call _packer_config.cmd ps1_download "%WGET_URL%" "%filename%" +call %SystemRoot%\_download_ps1.cmd "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 47659cf5..ea667bd5 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -53,8 +53,20 @@ if not defined PACKER_DEBUG set WGET_OPTS=--no-verbose if not errorlevel 1 if exist "%filename%" goto exit0 :powershell +echo ==^> Downloading "%url%" to "%filename%" + +if defined http_proxy ( + if defined no_proxy ( + set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" + ) else ( + set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" + ) +) else ( + set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" +) + +powershell -command %ps1_script% >nul -call _packer_config.cmd ps1_download "%filename%" "%url%" if not errorlevel 1 if exist "%filename%" goto exit0 diff --git a/floppy/_download_ps1.cmd b/floppy/_download_ps1.cmd deleted file mode 100644 index 0a6ebb27..00000000 --- a/floppy/_download_ps1.cmd +++ /dev/null @@ -1,17 +0,0 @@ -set url=%~1 -set filename=%~2 - -echo ==^> Downloading "%url%" to "%filename%" - -if defined http_proxy ( - if defined no_proxy ( - set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" - ) else ( - set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" - ) -) else ( - set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" -) - -powershell -command %ps1_script% >nul -exit /b diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index dc41e1a8..90b34166 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -1,10 +1,5 @@ @echo off -REM :: Calls functions with args from this file below. -REM if not "%~1" == "" ( -REM call :%* -REM ) - :: Uncomment the following to set a different Cygwin mirror :: Default: http://mirrors.kernel.org/sourceware/cygwin :: set CYGWIN_MIRROR_URL=http://mirrors.kernel.org/sourceware/cygwin @@ -57,24 +52,3 @@ set PACKER_SERVICES=opensshd sshd BvSshServer winrm :: set SSHD_PASSWORD=D@rj33l1ng exit /b - -REM :ps1_download -REM set url=%~1 -REM set filename=%~2 -REM -REM echo ==^> Downloading "%url%" to "%filename%" -REM -REM if defined http_proxy ( -REM if defined no_proxy ( -REM set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" -REM ) else ( -REM set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" -REM ) -REM ) else ( -REM set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" -REM ) -REM -REM powershell -command %ps1_script% >nul -REM exit /b - - diff --git a/floppy/cygwin.bat b/floppy/cygwin.bat index db669284..d26d447b 100644 --- a/floppy/cygwin.bat +++ b/floppy/cygwin.bat @@ -34,7 +34,7 @@ pushd "%CYGWIN_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%CYGWIN_URL%" "%CYGWIN_PATH%" ) else ( - call _packer_config.cmd ps1_download "%CYGWIN_URL%" "%CYGWIN_PATH%" + call %SystemRoot%\_download_ps1.cmd "%CYGWIN_URL%" "%CYGWIN_PATH% ) if errorlevel 1 goto exit1 diff --git a/floppy/hotfix-KB2842230.bat b/floppy/hotfix-KB2842230.bat index 9941db0f..0182bebb 100644 --- a/floppy/hotfix-KB2842230.bat +++ b/floppy/hotfix-KB2842230.bat @@ -30,7 +30,7 @@ pushd "%HOTFIX_2842230_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%HOTFIX_2842230_URL%" "%HOTFIX_2842230_PATH%" ) else ( - call _packer_config.cmd ps1_download "%HOTFIX_2842230_URL%" "%HOTFIX_2842230_PATH%" + call %SystemRoot%\_download_ps1.cmd "%HOTFIX_2842230_URL%" "%HOTFIX_2842230_PATH%" ) if errorlevel 1 goto exit1 diff --git a/floppy/openssh.bat b/floppy/openssh.bat index 14f2007e..894a1144 100644 --- a/floppy/openssh.bat +++ b/floppy/openssh.bat @@ -18,7 +18,7 @@ pushd "%OPENSSH_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%OPENSSH_URL%" "%OPENSSH_PATH%" ) else ( - call _packer_config.cmd ps1_download "%OPENSSH_URL%" "%OPENSSH_PATH%" + call %SystemRoot%\_download_ps1.cmd "%OPENSSH_URL%" "%OPENSSH_PATH%" ) if not exist "%OPENSSH_PATH%" goto exit1 diff --git a/script/01-install-handle.cmd b/script/01-install-handle.cmd index 381f305a..01ec4367 100644 --- a/script/01-install-handle.cmd +++ b/script/01-install-handle.cmd @@ -15,7 +15,7 @@ pushd "%HANDLE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%HANDLE_URL%" "%HANDLE_PATH%" ) else ( - call _packer_config.cmd ps1_download "%HANDLE_URL%" "%HANDLE_PATH%" + call %SystemRoot%\_download_ps1.cmd "%HANDLE_URL%" "%HANDLE_PATH%" ) if not exist "%HANDLE_PATH%" goto exit1 diff --git a/script/cmtool.bat b/script/cmtool.bat index e9316abc..f516d58f 100644 --- a/script/cmtool.bat +++ b/script/cmtool.bat @@ -42,7 +42,7 @@ pushd "%CHEF_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%CHEF_URL%" "%CHEF_PATH%" ) else ( - call _packer_config.cmd ps1_download "%CHEF_URL%" "%CHEF_PATH%" + call %SystemRoot%\_download_ps1.cmd "%CHEF_URL%" "%CHEF_PATH%" ) if not exist "%CHEF_PATH%" goto exit1 @@ -80,7 +80,7 @@ echo ==^> Downloading Chef DK to %CHEFDK_PATH% if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%CHEFDK_URL%" "%CHEFDK_PATH%" ) else ( - call _packer_config.cmd ps1_download "%CHEFDK_URL%" "%CHEFDK_PATH%" + call %SystemRoot%\_download_ps1.cmd "%CHEFDK_URL%" "%CHEFDK_PATH%" ) if not exist "%CHEFDK_PATH%" goto exit1 @@ -120,7 +120,7 @@ if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%PUPPET_URL%" "%PUPPET_PATH%" ) else ( echo ==^> Downloading %PUPPET_URL% to %PUPPET_PATH% - call _packer_config.cmd ps1_download "%PUPPET_URL%" "%PUPPET_PATH%" + call %SystemRoot%\_download_ps1.cmd "%PUPPET_URL%" "%PUPPET_PATH%" ) if not exist "%PUPPET_PATH%" goto exit1 @@ -159,7 +159,7 @@ pushd "%SALT_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SALT_URL%" "%SALT_PATH%" ) else ( - call _packer_config.cmd ps1_download "%SALT_URL%" "%SALT_PATH%" + call %SystemRoot%\_download_ps1.cmd "%SALT_URL%" "%SALT_PATH%" ) if not exist "%SALT_PATH%" goto exit1 diff --git a/script/ultradefrag.bat b/script/ultradefrag.bat index 603eb4c2..62f1ded9 100644 --- a/script/ultradefrag.bat +++ b/script/ultradefrag.bat @@ -54,7 +54,7 @@ cd /d "%SEVENZIP_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%" ) else ( - call _packer_config.cmd ps1_download "%SEVENZIP_URL%" "%SEVENZIP_PATH%" + call %SystemRoot%\_download_ps1.cmd "%SEVENZIP_URL%" "%SEVENZIP_PATH%" ) if not exist "%SEVENZIP_PATH%" goto return1 @@ -131,7 +131,7 @@ pushd "%ULTRADEFRAG_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%ULTRADEFRAG_URL%" "%ULTRADEFRAG_PATH%" ) else ( - call _packer_config.cmd ps1_download "%ULTRADEFRAG_URL%" "%ULTRADEFRAG_PATH%" + call %SystemRoot%\_download_ps1.cmd "%ULTRADEFRAG_URL%" "%ULTRADEFRAG_PATH%" ) if not exist "%ULTRADEFRAG_PATH%" goto exit1 diff --git a/script/vmtool.bat b/script/vmtool.bat index c9fec62d..2f02018a 100644 --- a/script/vmtool.bat +++ b/script/vmtool.bat @@ -41,7 +41,7 @@ cd /d "%SEVENZIP_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%" ) else ( - call _packer_config.cmd ps1_download "%SEVENZIP_URL%" "%SEVENZIP_PATH%" + call %SystemRoot%\_download_ps1.cmd "%SEVENZIP_URL%" "%SEVENZIP_PATH%" ) if not exist "%SEVENZIP_PATH%" goto return1 echo ==^> Installing "%SEVENZIP_PATH%" @@ -126,7 +126,7 @@ if defined VMWARE_TOOLS_ISO_PATH goto install_vmware_tools_from_iso if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" ) else ( - call _packer_config.cmd ps1_download "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" + call %SystemRoot%\_download_ps1.cmd "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" ) if not exist "%VMWARE_TOOLS_TAR_PATH%" goto exit1 call :install_sevenzip @@ -201,7 +201,7 @@ if %_VBOX_ISO_SIZE% GTR 0 goto install_vbox_guest_additions_from_iso if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%" ) else ( - call _packer_config.cmd ps1_download "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%" + call %SystemRoot%\_download_ps1.cmd "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%" ) if not exist "%VBOX_ISO_PATH%" goto exit1 From abe9e6fb5266ce27a72393271eaceaffdfd38adf Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 12:35:44 -0500 Subject: [PATCH 21/38] incorporate powershell download with proxy into _download.cmd --- floppy/01-install-wget.cmd | 7 ------- floppy/bitvisessh.bat | 3 --- floppy/cygwin.bat | 2 -- floppy/hotfix-KB2842230.bat | 2 -- floppy/openssh.bat | 2 -- script/01-install-handle.cmd | 2 -- script/cmtool.bat | 9 --------- script/sdelete.bat | 3 --- script/ultradefrag.bat | 2 -- script/vagrant.bat | 2 -- script/vmtool.bat | 6 ------ 11 files changed, 40 deletions(-) diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index 8268ea28..4b98b486 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -13,18 +13,11 @@ for %%i in ("%WGET_URL%") do set filename=%SystemRoot%\%%~nxi if not exist "%~dp0\_download.cmd" goto _download_cmd_not_found copy /y "%~dp0\_download.cmd" "%SystemRoot%\" -copy /y "%~dp0\_download_ps1.cmd" "%SystemRoot%\" call "%~dp0\_download.cmd" "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 -:_download_cmd_not_found - -call %SystemRoot%\_download_ps1.cmd "%WGET_URL%" "%filename%" - -if exist "%filename%" goto exit0 - if defined DISABLE_BITS ( if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 ) diff --git a/floppy/bitvisessh.bat b/floppy/bitvisessh.bat index 5b54a246..b0b0bef0 100644 --- a/floppy/bitvisessh.bat +++ b/floppy/bitvisessh.bat @@ -17,9 +17,6 @@ pushd "%BITVISE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%BITVISE_URL%" "%BITVISE_PATH%" -) else ( - echo ==^> Downloading "%BITVISE_URL%" to "%BITVISE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%BITVISE_URL%', '%BITVISE_PATH%')" Downloading Chef DK to %CHEFDK_PATH% if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%CHEFDK_URL%" "%CHEFDK_PATH%" -) else ( - call %SystemRoot%\_download_ps1.cmd "%CHEFDK_URL%" "%CHEFDK_PATH%" ) if not exist "%CHEFDK_PATH%" goto exit1 @@ -118,9 +114,6 @@ pushd "%PUPPET_DIR%" :: todo support CM_VERSION variable if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%PUPPET_URL%" "%PUPPET_PATH%" -) else ( - echo ==^> Downloading %PUPPET_URL% to %PUPPET_PATH% - call %SystemRoot%\_download_ps1.cmd "%PUPPET_URL%" "%PUPPET_PATH%" ) if not exist "%PUPPET_PATH%" goto exit1 @@ -158,8 +151,6 @@ pushd "%SALT_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SALT_URL%" "%SALT_PATH%" -) else ( - call %SystemRoot%\_download_ps1.cmd "%SALT_URL%" "%SALT_PATH%" ) if not exist "%SALT_PATH%" goto exit1 diff --git a/script/sdelete.bat b/script/sdelete.bat index 26dc7e21..6943ea6c 100644 --- a/script/sdelete.bat +++ b/script/sdelete.bat @@ -14,9 +14,6 @@ pushd "%SDELETE_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SDELETE_URL%" "%SDELETE_PATH%" -) else ( - echo ==^> Downloading "%SDELETE_URL%" to "%SDELETE_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SDELETE_URL%', '%SDELETE_PATH%')" Installing "%SEVENZIP_PATH%" @@ -125,8 +123,6 @@ if %_VMWARE_TOOLS_SIZE% EQU 0 set VMWARE_TOOLS_ISO_PATH= if defined VMWARE_TOOLS_ISO_PATH goto install_vmware_tools_from_iso if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" -) else ( - call %SystemRoot%\_download_ps1.cmd "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" ) if not exist "%VMWARE_TOOLS_TAR_PATH%" goto exit1 call :install_sevenzip @@ -200,8 +196,6 @@ if %_VBOX_ISO_SIZE% GTR 0 goto install_vbox_guest_additions_from_iso if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%" -) else ( - call %SystemRoot%\_download_ps1.cmd "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%" ) if not exist "%VBOX_ISO_PATH%" goto exit1 From a7e9b27a4747962315232ed66dc16d51ec2be252 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 12:48:09 -0500 Subject: [PATCH 22/38] incorporate powershell download with proxy into _download.cmd --- floppy/_download.cmd | 1 - script/ultradefrag.bat | 1 + 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/floppy/_download.cmd b/floppy/_download.cmd index ea667bd5..1d6e04d6 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -67,7 +67,6 @@ if defined http_proxy ( powershell -command %ps1_script% >nul - if not errorlevel 1 if exist "%filename%" goto exit0 if defined DISABLE_BITS ( diff --git a/script/ultradefrag.bat b/script/ultradefrag.bat index a622a6ab..723f9251 100644 --- a/script/ultradefrag.bat +++ b/script/ultradefrag.bat @@ -131,6 +131,7 @@ pushd "%ULTRADEFRAG_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%ULTRADEFRAG_URL%" "%ULTRADEFRAG_PATH%" ) + if not exist "%ULTRADEFRAG_PATH%" goto exit1 call :install_sevenzip From 2247aeb552a00bc5b410cda89aa4e1df72ec990f Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 13:53:40 -0500 Subject: [PATCH 23/38] incorporate powershell download with proxy into _download.cmd --- script/clean.bat | 3 --- 1 file changed, 3 deletions(-) diff --git a/script/clean.bat b/script/clean.bat index ff7c006c..6a71e9d9 100644 --- a/script/clean.bat +++ b/script/clean.bat @@ -35,9 +35,6 @@ echo ==^> Cleaning "%SystemRoot%\TEMP" files >&2 for %%i in ("%SystemRoot%\TEMP\*.*") do if /i not "%%~nxi" equ "%~nx0" echo del /f /q /s "%%~i" -REM echo ==^> Cleaning "%SystemRoot%\_packer_config.cmd" file >&2 -REM del /f /q /s "%SystemRoot%\_packer_config.cmd" - echo ==^> Removing potentially corrupt recycle bin :: see http://www.winhelponline.com/blog/fix-corrupted-recycle-bin-windows-7-vista/ rmdir /q /s %SystemDrive%\$Recycle.bin From 4331a65fe56e312f20ec525f4ba999a4adb0adc7 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Mon, 24 Feb 2020 14:24:42 -0500 Subject: [PATCH 24/38] incorporate powershell download with proxy into _download.cmd --- script/vmtool.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/vmtool.bat b/script/vmtool.bat index 0ecaf9ae..b7676404 100644 --- a/script/vmtool.bat +++ b/script/vmtool.bat @@ -82,6 +82,8 @@ goto :eof :::::::::::: echo "%PACKER_BUILDER_TYPE%" | findstr /i "vmware" >nul if not errorlevel 1 goto vmware +echo "%PACKER_BUILDER_TYPE%" | findstr /i "vsphere" >nul +if not errorlevel 1 goto vmware echo "%PACKER_BUILDER_TYPE%" | findstr /i "virtualbox" >nul if not errorlevel 1 goto virtualbox echo "%PACKER_BUILDER_TYPE%" | findstr /i "parallels" >nul From 5390bc26da5d2d2856312d01410d27ed1ff36dca Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 09:15:38 -0500 Subject: [PATCH 25/38] merge Makefile --- Makefile | 8 +++++++- script/ultradefrag.bat | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index bb42d88e..a49aea13 100644 --- a/Makefile +++ b/Makefile @@ -64,7 +64,7 @@ WIN81_X64_PRO_CHECKSUM ?= e50a6f0f08e933f25a71fbc843827fe752ed0365 WIN81_X86_PRO ?= iso/en_windows_8.1_professional_vl_with_update_x86_dvd_4065201.iso WIN81_X86_PRO_CHECKSUM ?= c2d6f5d06362b7cb17dfdaadfb848c760963b254 -# Possible values for CM: (nocm | chef | chefdk | salt | puppet) +# Possible values for CM: (nocm | chef | chefdk | chef-workstation | salt | puppet) CM ?= nocm # Possible values for CM_VERSION: (latest | x.y.z | x.y) CM_VERSION ?= @@ -91,6 +91,12 @@ else endif # Packer does not allow empty variables, so only pass variables that are defined PACKER_VARS := -var 'cm=$(CM)' -var 'version=$(BOX_VERSION)' -var 'update=$(UPDATE)' -var 'headless=$(HEADLESS)' -var "shutdown_command=$(SHUTDOWN_COMMAND)" +ifdef HW_VERSION + PACKER_VARS += -var 'hw_version=$(HW_VERSION)' +endif +ifdef CM_OPTIONS + PACKER_VARS += -var 'cm_options=$(CM_OPTIONS)' +endif ifdef CM_VERSION PACKER_VARS += -var 'cm_version=$(CM_VERSION)' endif diff --git a/script/ultradefrag.bat b/script/ultradefrag.bat index 723f9251..c9da88bd 100644 --- a/script/ultradefrag.bat +++ b/script/ultradefrag.bat @@ -54,7 +54,7 @@ cd /d "%SEVENZIP_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%" ) else ( - call %SystemRoot%\_download_ps1.cmd "%SEVENZIP_URL%" "%SEVENZIP_PATH%" + call %SystemRoot%\_download_ps1.cmd "%SEVENZIP_URL%" "%SEVENZIP_PATH%" ) if not exist "%SEVENZIP_PATH%" goto return1 From 3deb45ef348788755717332a143faa687870931a Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 09:22:51 -0500 Subject: [PATCH 26/38] sync with proxy --- script/cmtool.bat | 278 +++++++++++++++++++++++++++++++---------- script/ultradefrag.bat | 3 - script/vmtool.bat | 19 +-- 3 files changed, 217 insertions(+), 83 deletions(-) diff --git a/script/cmtool.bat b/script/cmtool.bat index 155180da..5c7a6c3c 100644 --- a/script/cmtool.bat +++ b/script/cmtool.bat @@ -2,34 +2,129 @@ @for %%i in (a:\_packer_config*.cmd) do @call "%%~i" @if defined PACKER_DEBUG (@echo on) else (@echo off) -if not defined CM echo ==^> ERROR: The "CM" variable was not found in the environment & goto exit1 +:: Get the PlatformVersion from SystemInfo +for /f "delims=:; tokens=1,2" %%a in ('systeminfo') do ( + if "%%a" == "OS Version" set PlatformVersionRow=%%b +) + +:: Extract the major/minor version (stripped) +for /f "delims=.; tokens=1,2" %%a in ("%PlatformVersionRow%") do ( + for /f "tokens=*" %%v in ("%%a") do set PlatformVersionMajor=%%v + for /f "tokens=*" %%v in ("%%b") do set PlatformVersionMinor=%%v +) + +echo ==^> Detected Windows Platform Version: %PlatformVersionMajor%.%PlatformVersionMinor% -if "%CM%" == "nocm" goto nocm +:: Set some reasonable defaults +if not defined TEMP set TEMP=%LOCALAPPDATA%\Temp -if not defined CM_VERSION echo ==^> ERROR: The "CM_VERSION" variable was not found in the environment & set CM_VERSION=latest +:: Figure out which configuration management tool to use +if not defined CM echo ==^> ERROR: The "CM" variable was not found in the environment & goto exit1 +if "%CM%" == "nocm" goto nocm + +if not defined CM_VERSION ( + echo ==^> ERROR: The "CM_VERSION" variable was not found in the environment + set CM_VERSION=latest +) -if "%CM%" == "chef" goto chef -if "%CM%" == "chefdk" goto chefdk +if "%CM%" == "chef" goto omnitruck +if "%CM%" == "chefdk" goto omnitruck +if "%CM%" == "chef-workstation" goto omnitruck if "%CM%" == "puppet" goto puppet -if "%CM%" == "salt" goto salt +if "%CM%" == "salt" goto salt echo ==^> ERROR: Unknown value for environment variable CM: "%CM%" goto exit1 :::::::::::: -:chef +:omnitruck :::::::::::: -if not defined CHEF_URL if "%CM_VERSION%" == "latest" set CM_VERSION=13.6.4 -if not defined CHEF_URL set CHEF_64_URL=https://packages.chef.io/files/stable/chef/%CM_VERSION%/windows/2008r2/chef-client-%CM_VERSION%-1-x64.msi -if not defined CHEF_URL set CHEF_32_URL=https://packages.chef.io/files/stable/chef/%CM_VERSION%/windows/2008r2/chef-client-%CM_VERSION%-1-x86.msi +:: If we already have the CHEF_URL, then we don't need to use Omnitruck and we can move on +if defined CHEF_URL goto chef + +:: Determine each component for using the Omnitruck API to get the desired Chef component +if not defined OMNITRUCK_CHANNEL set OMNITRUCK_CHANNEL=stable + +:: Figure out the Omnitruck product +if "%CM%" == "chef" ( + set "OMNITRUCK_PRODUCT=chef" + set "OMNITRUCK_FREE_VERSION=14.14.29" +) else if "%CM%" == "chefdk" ( + set "OMNITRUCK_PRODUCT=chefdk" + set "OMNITRUCK_FREE_VERSION=3.12.10" +) else if "%CM%" == "chef-workstation" ( + set "OMNITRUCK_PRODUCT=chef-workstation" + set "OMNITRUCK_FREE_VERSION=0.3.2" +) else ( + echo Unknown Chef Product: %CM% + goto exit1 +) + +:: Check the CM_VERSION that the user specified.. +if "%CM_VERSION%" == "latest" ( + :: ...and let them know if they chose the most recent free version. + echo ==^> User has chosen the most recent free version of %OMNITRUCK_PRODUCT% + set OMNITRUCK_VERSION=%OMNITRUCK_FREE_VERSION% + +) else if "%CM_VERSION%" == "licensed" ( + :: ...or the most recent licensed version. + echo ==^> User has chosen the most recent licensed version of %OMNITRUCK_PRODUCT% + set OMNITRUCK_VERSION=latest + +) else if defined OMNITRUCK_VERSION ( + :: ...or their own version if they explicitly set an environment variable + echo ==^> User has explicitly chosen the version %OMNITRUCK_VERSION% for %OMNITRUCK_PRODUCT% +) + +:: Deterine the other desired parameters here +if not defined OMNITRUCK_PLATFORM set OMNITRUCK_PLATFORM=windows +if not defined OMNITRUCK_VERSION set OMNITRUCK_VERSION=%CM_VERSION% + +if not defined OMNITRUCK_MACHINE_ARCH ( + if "%PROCESSOR_ARCHITECTURE%" == "x86" ( + set OMNITRUCK_MACHINE_ARCH=x86 + ) else ( + set OMNITRUCK_MACHINE_ARCH=x64 + ) +) + +:: We exclude the platform version as the Omnitruck API doesn't seem to use this +:: set OMNITRUCK_PLATFORM_VERSION= + +:: strip -1 if %OMNITRUCK_VERSION% ends in -1 +set OMNITRUCK_VERSION=%OMNITRUCK_VERSION:-1=% + +:: Use the Omnitruck API to determine the CHEF_URL +echo ==^> Getting %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% %OMNITRUCK_MACHINE_ARCH% download URL +set url="https://omnitruck.chef.io/%OMNITRUCK_CHANNEL%/%OMNITRUCK_PRODUCT%/metadata?p=%OMNITRUCK_PLATFORM%&m=%OMNITRUCK_MACHINE_ARCH%&v=%OMNITRUCK_VERSION%" +set filename="%TEMP%\omnitruck.txt" + +echo ==^> Using Chef Omnitruck API URL: !url! +call "%SystemRoot%\_download.cmd" !url! !filename! + +if not exist "%TEMP%\omnitruck.txt" ( + echo Unable to download metadata for %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% on the %OMNITRUCK_CHANNEL% channel for %OMNITRUCK_PLATFORM% %OMNITRUCK_MACHINE_ARCH% -if defined ProgramFiles(x86) ( - SET CHEF_URL=%CHEF_64_URL% ) else ( - SET CHEF_URL=%CHEF_32_URL% + for /f "tokens=2 usebackq" %%a in (`findstr "url" "%TEMP%\omnitruck.txt"`) do ( + set CHEF_URL=%%a + ) +) + +if not defined CHEF_URL ( + echo Could not determine the %OMNITRUCK_PRODUCT% %OMNITRUCK_VERSION% download url... + goto exit1 ) +echo ==^> Got %OMNITRUCK_PRODUCT% download URL: !CHEF_URL! + +goto chef + +:::::::::::: +:chef +:::::::::::: +if not defined CHEF_OPTIONS set CHEF_OPTIONS=%CM_OPTIONS% for %%i in ("%CHEF_URL%") do set CHEF_MSI=%%~nxi set CHEF_DIR=%TEMP%\chef @@ -44,7 +139,7 @@ if exist "%SystemRoot%\_download.cmd" ( ) if not exist "%CHEF_PATH%" goto exit1 -echo ==^> Installing Chef client %CM_VERSION% +echo ==^> Installing %CM% %CM_VERSION% msiexec /qb /i "%CHEF_PATH%" /l*v "%CHEF_DIR%\chef.log" %CHEF_OPTIONS% @if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: msiexec /qb /i "%CHEF_PATH%" /l*v "%CHEF_DIR%\chef.log" %CHEF_OPTIONS% @@ -53,54 +148,57 @@ ver>nul goto exit0 :::::::::::: -:chefdk +:puppet :::::::::::: +if not defined PUPPET_OPTIONS set PUPPET_OPTIONS=%CM_OPTIONS% -if not defined CHEFDK_URL if "%CM_VERSION%" == "latest" set CM_VERSION=2.3.4 -if not defined CHEFDK_URL set CHEFDK_64_URL=https://packages.chef.io/files/stable/chefdk/%CM_VERSION%/windows/2008r2/chefdk-%CM_VERSION%-1-x86.msi -if not defined CHEFDK_URL set CHEFDK_32_URL=https://packages.chef.io/files/stable/chefdk/%CM_VERSION%/windows/2008r2/chefdk-%CM_VERSION%-1-x86.msi - -if defined ProgramFiles(x86) ( - SET CHEFDK_URL=%CHEFDK_64_URL% -) else ( - SET CHEFDK_URL=%CHEFDK_32_URL% -) - -for %%i in ("%CHEFDK_URL%") do set CHEFDK_MSI=%%~nxi -set CHEFDK_DIR=%TEMP%\chefdk -set CHEFDK_PATH=%CHEFDK_DIR%\%CHEFDK_MSI% +if defined PUPPET_URL goto puppetinstall -echo ==^> Creating "%CHEFDK_DIR%" -mkdir "%CHEFDK_DIR%" -pushd "%CHEFDK_DIR%" - -echo ==^> Downloading Chef DK to %CHEFDK_PATH% -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%CHEFDK_URL%" "%CHEFDK_PATH%" +:: If we're using the latest, then hardcode the 32-bit/64-bit urls and install +if "%CM_VERSION%" == "latest" ( + set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-x86-latest.msi + set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-x64-latest.msi + goto puppetinstall ) -if not exist "%CHEFDK_PATH%" goto exit1 -echo ==^> Installing Chef Development Kit %CM_VERSION% -msiexec /qb /i "%CHEFDK_PATH%" /l*v "%CHEFDK_DIR%\chef.log" %CHEFDK_OPTIONS% +:: Figure out the major version requested by the user +for /f "delims=." %%v in ("%CM_VERSION%") do set PUPPET_MAJOR_VERSION=%%v -@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: msiexec /qb /i "%CHEFDK_PATH%" /l*v "%CHEFDK_DIR%\chef.log" %CHEFDK_OPTIONS% -ver>nul - -goto exit0 +:: Now we can use it to figure out the correct url format for that version +if "%PUPPET_MAJOR_VERSION%" == "1" goto puppet1 +if "%PUPPET_MAJOR_VERSION%" == "5" goto puppet5 +goto puppetlatest :::::::::::: -:puppet +:puppet1 :::::::::::: +if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet-agent-%CM_VERSION%-x64.msi +if not defined PUPPET_URL set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet-agent-%CM_VERSION%-x86.msi +goto puppetinstall -:: if "%CM_VERSION%" == "latest" set CM_VERSION=3.8.7 +:::::::::::: +:puppet5 +:::::::::::: +if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet5/puppet-agent-%CM_VERSION%-x64.msi +if not defined PUPPET_URL set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet5/puppet-agent-%CM_VERSION%-x86.msi +goto puppetinstall -if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet-x64-%CM_VERSION%.msi -if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet-%CM_VERSION%.msi +:::::::::::: +:puppetlatest +:::::::::::: +if not defined PUPPET_URL set PUPPET_64_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-%CM_VERSION%-x64.msi +if not defined PUPPET_URL set PUPPET_32_URL=https://downloads.puppetlabs.com/windows/puppet/puppet-agent-%CM_VERSION%-x86.msi +goto puppetinstall -if defined ProgramFiles(x86) ( - set PUPPET_URL=%PUPPET_64_URL% -) else ( - set PUPPET_URL=%PUPPET_32_URL% +:::::::::::: +:puppetinstall +:::::::::::: +if not defined PUPPET_URL ( + if "%PROCESSOR_ARCHITECTURE%" == "x86" ( + set PUPPET_URL=%PUPPET_32_URL% + ) else ( + set PUPPET_URL=%PUPPET_64_URL% + ) ) for %%i in ("%PUPPET_URL%") do set PUPPET_MSI=%%~nxi @@ -129,33 +227,79 @@ goto exit0 :::::::::::: :salt :::::::::::: +if not defined SALT_OPTIONS set SALT_OPTIONS=%CM_OPTIONS% +if not defined SALT_REVISION set SALT_REVISION=stable + +set SALT_DIR=%TEMP%\salt +echo ==^> Creating "%SALT_DIR%" +mkdir "%SALT_DIR%" +pushd "%SALT_DIR%" + +:: If we're on a platform where salt-bootstrap is buggy, then fall back to just +:: using the regular salt-repository method. +if "%PlatformVersionMajor%" == "5" goto saltrepository +if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "0" goto saltrepository +if "%PlatformVersionMajor%" == "6" if "%PlatformVersionMinor%" == "1" goto saltrepository + +:::::::::::: +:saltbootstrap +:::::::::::: + +:: We hardcode the CM_VERSION here to workaround saltstack/salt-bootstrap#1394 +if "%CM_VERSION%" == "latest" set CM_VERSION=2019.2.2 -if "%CM_VERSION%" == "latest" set CM_VERSION=2015.8.8-2 +set SALT_URL=http://raw.githubusercontent.com/saltstack/salt-bootstrap/%SALT_REVISION%/bootstrap-salt.ps1 -if not defined SALT_64_URL set SALT_64_URL=https://repo.saltstack.com/windows/Salt-Minion-%CM_VERSION%-AMD64-Setup.exe -if not defined SALT_32_URL set SALT_32_URL=https://repo.saltstack.com/windows/Salt-Minion-%CM_VERSION%-x86-Setup.exe +set SALT_PATH=%SALT_DIR%\bootstrap-salt.ps1 +set SALT_DOWNLOAD=%SALT_DIR%\bootstrap-salt.download.ps1 -if defined ProgramFiles(x86) ( - set SALT_URL=%SALT_64_URL% +if exist "%SystemRoot%\_download.cmd" ( + call "%SystemRoot%\_download.cmd" "%SALT_URL%" "%SALT_DOWNLOAD%" +) + +if not exist "%SALT_DOWNLOAD%" goto exit1 +echo ==^> Patching bootstrap-salt.ps1 at %SALT_DOWNLOAD% +powershell -command "(get-content \"%SALT_DOWNLOAD%\") -replace \"'Tls,Tls11,Tls12'\", \"0xc0,0x300,0xc00\" | set-content \"%SALT_PATH%\"" + +echo ==^> Installing Salt minion with %SALT_PATH% +if "%CM_VERSION%" == "latest" ( + powershell "%SALT_PATH%" %SALT_OPTIONS% ) else ( - set SALT_URL=%SALT_32_URL% + powershell "%SALT_PATH%" -version "%CM_VERSION%" %SALT_OPTIONS% ) -for %%i in ("%SALT_URL%") do set SALT_EXE=%%~nxi -set SALT_DIR=%TEMP%\salt -set SALT_PATH=%SALT_DIR%\%SALT_EXE% +@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%SALT_PATH%" -version "%CM_VERSION%" %SALT_OPTIONS% +ver>nul -echo ==^> Creating "%SALT_DIR%" -mkdir "%SALT_DIR%" -pushd "%SALT_DIR%" +goto exit0 -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%SALT_URL%" "%SALT_PATH%" +:::::::::::: +:saltrepository +:::::::::::: + +if not defined SALT_PYTHONVERSION set SALT_PYTHONVERSION=Py3 + +if not defined SALT_ARCH ( + if "%PROCESSOR_ARCHITECTURE%" == "x86" ( + set SALT_ARCH=x86 + ) else ( + set SALT_ARCH=AMD64 + ) ) -if not exist "%SALT_PATH%" goto exit1 -echo ==^> Installing Salt minion -:: see http://docs.saltstack.com/en/latest/topics/installation/windows.html +if "%CM_VERSION%" == "latest" ( + set SALT_URL=http://repo.saltstack.com/windows/Salt-Minion-Latest-%SALT_PYTHONVERSION%-%SALT_ARCH%-Setup.exe +) else ( + set SALT_URL=http://repo.saltstack.com/windows/Salt-Minion-%CM_VERSION%-%SALT_PYTHONVERSION%-%SALT_ARCH%-Setup.exe +) + +set SALT_PATH=%SALT_DIR%\Salt-Minion-Setup.exe + +echo ==^> Downloading %SALT_URL% to %SALT_PATH% +call "%SystemRoot%\_download.cmd" %SALT_URL% %SALT_PATH% + +echo ==^> Installing Salt minion %CM_VERSION%-%SALT_PYTHONVERSION% with %SALT_PATH% + "%SALT_PATH%" /S %SALT_OPTIONS% @if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%SALT_PATH%" /S %SALT_OPTIONS% diff --git a/script/ultradefrag.bat b/script/ultradefrag.bat index c9da88bd..6225afc7 100644 --- a/script/ultradefrag.bat +++ b/script/ultradefrag.bat @@ -53,8 +53,6 @@ cd /d "%SEVENZIP_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%" -) else ( - call %SystemRoot%\_download_ps1.cmd "%SEVENZIP_URL%" "%SEVENZIP_PATH%" ) if not exist "%SEVENZIP_PATH%" goto return1 @@ -131,7 +129,6 @@ pushd "%ULTRADEFRAG_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%ULTRADEFRAG_URL%" "%ULTRADEFRAG_PATH%" ) - if not exist "%ULTRADEFRAG_PATH%" goto exit1 call :install_sevenzip diff --git a/script/vmtool.bat b/script/vmtool.bat index b7676404..b9b807fa 100644 --- a/script/vmtool.bat +++ b/script/vmtool.bat @@ -38,9 +38,7 @@ set SEVENZIP_PATH=%SEVENZIP_DIR%\%SEVENZIP_MSI% echo ==^> Creating "%SEVENZIP_DIR%" mkdir "%SEVENZIP_DIR%" cd /d "%SEVENZIP_DIR%" -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%" -) +call "%SystemRoot%\_download.cmd" "%SEVENZIP_URL%" "%SEVENZIP_PATH%" if not exist "%SEVENZIP_PATH%" goto return1 echo ==^> Installing "%SEVENZIP_PATH%" msiexec /qb /i "%SEVENZIP_PATH%" @@ -82,8 +80,6 @@ goto :eof :::::::::::: echo "%PACKER_BUILDER_TYPE%" | findstr /i "vmware" >nul if not errorlevel 1 goto vmware -echo "%PACKER_BUILDER_TYPE%" | findstr /i "vsphere" >nul -if not errorlevel 1 goto vmware echo "%PACKER_BUILDER_TYPE%" | findstr /i "virtualbox" >nul if not errorlevel 1 goto virtualbox echo "%PACKER_BUILDER_TYPE%" | findstr /i "parallels" >nul @@ -123,9 +119,8 @@ if defined VMWARE_TOOLS_ISO_PATH for %%i in (%VMWARE_TOOLS_ISO_PATH%) do set _VM if %_VMWARE_TOOLS_SIZE% EQU 0 set VMWARE_TOOLS_ISO_PATH= if defined VMWARE_TOOLS_ISO_PATH goto install_vmware_tools_from_iso -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" -) +call "%SystemRoot%\_download.cmd" "%VMWARE_TOOLS_TAR_URL%" "%VMWARE_TOOLS_TAR_PATH%" + if not exist "%VMWARE_TOOLS_TAR_PATH%" goto exit1 call :install_sevenzip if errorlevel 1 goto exit1 @@ -168,7 +163,7 @@ echo ==^> Installing VMware tools "%VMWARE_TOOLS_SETUP_PATH%" /S /v "/qn REBOOT=R ADDLOCAL=ALL" @if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%VMWARE_TOOLS_SETUP_PATH%" /S /v "/qn REBOOT=R ADDLOCAL=ALL" ver>nul -goto :exit0 +goto exit0 :::::::::::: :virtualbox @@ -196,9 +191,8 @@ set _VBOX_ISO_SIZE=0 if exist "%VBOX_ISO_PATH%" for %%i in (%VBOX_ISO_PATH%) do set _VBOX_ISO_SIZE=%%~zi if %_VBOX_ISO_SIZE% GTR 0 goto install_vbox_guest_additions_from_iso -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%" -) +call "%SystemRoot%\_download.cmd" "%VBOX_ISO_URL%" "%VBOX_ISO_PATH%" + if not exist "%VBOX_ISO_PATH%" goto exit1 :install_vbox_guest_additions_from_iso @@ -279,7 +273,6 @@ if "%GUEST_OS%" == "Windows Server 2016" goto :exit0 goto :exit0 :exit0 - @ver>nul @goto :exit From edd95b6d8c86bb46813b268ad61aa115c0ccca89 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 09:24:02 -0500 Subject: [PATCH 27/38] sync with proxy --- script/vmtool.bat | 2 ++ 1 file changed, 2 insertions(+) diff --git a/script/vmtool.bat b/script/vmtool.bat index b9b807fa..d9aaa33c 100644 --- a/script/vmtool.bat +++ b/script/vmtool.bat @@ -80,6 +80,8 @@ goto :eof :::::::::::: echo "%PACKER_BUILDER_TYPE%" | findstr /i "vmware" >nul if not errorlevel 1 goto vmware +echo "%PACKER_BUILDER_TYPE%" | findstr /i "vsphere" >nul +if not errorlevel 1 goto vmware echo "%PACKER_BUILDER_TYPE%" | findstr /i "virtualbox" >nul if not errorlevel 1 goto virtualbox echo "%PACKER_BUILDER_TYPE%" | findstr /i "parallels" >nul From 6cda48c338ea24abfe60acabb5cd6906152976ad Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 09:36:22 -0500 Subject: [PATCH 28/38] sync with proxy --- floppy/00-run-all-scripts.cmd | 4 ---- floppy/01-install-wget.cmd | 6 ----- floppy/_download.cmd | 39 ++++++++++++++++++++------------- floppy/_post_update_install.bat | 2 +- floppy/disablewinupdate.bat | 2 +- floppy/hotfix-KB2842230.bat | 1 - floppy/upgrade-wua.bat | 3 --- 7 files changed, 26 insertions(+), 31 deletions(-) diff --git a/floppy/00-run-all-scripts.cmd b/floppy/00-run-all-scripts.cmd index c6709e34..3ed89f58 100644 --- a/floppy/00-run-all-scripts.cmd +++ b/floppy/00-run-all-scripts.cmd @@ -2,10 +2,6 @@ @for %%i in (%~dp0\_packer_config*.cmd) do @call "%%~i" @if defined PACKER_DEBUG (@echo on) else (@echo off) -REM if exist %~dp0\_packer_config.cmd ( -REM copy %~dp0\_packer_config.cmd "%SystemRoot%\" -REM ) - goto main :::::::::::: diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index 4b98b486..2120eb52 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -10,18 +10,12 @@ if not defined WGET_URL set WGET_URL=https://eternallybored.org/misc/wget/curren for %%i in ("%WGET_URL%") do set filename=%SystemRoot%\%%~nxi -if not exist "%~dp0\_download.cmd" goto _download_cmd_not_found - copy /y "%~dp0\_download.cmd" "%SystemRoot%\" call "%~dp0\_download.cmd" "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 -if defined DISABLE_BITS ( - if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 -) - set bitsadmin= for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 1d6e04d6..75a5eb4b 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -4,9 +4,9 @@ if not defined PACKER_SEARCH_PATHS set PACKER_SEARCH_PATHS="%USERPROFILE%" a: b: c: d: e: f: g: h: i: j: k: l: m: n: o: p: q: r: s: t: u: v: w: x: y: z: -set url=%~1 +set "url=%~1" -set filename=%~2 +set "filename=%~2" if not defined url echo ==^> ERROR: _download.cmd called without URL parameter. & goto exit1 @@ -31,8 +31,8 @@ echo ==^> Copying "%found%" to "%filename%", skipping download. copy /y "%found%" "%filename%" && goto exit0 :download - -echo ==^> Downloading "%url%" to "%filename%" +REM IT IS JUST CLEANER WITH THIS WGET IS REALLY PICKY. POWERSHELL - NOT SO MUCH +if defined http_proxy goto powershell set wget= @@ -46,33 +46,40 @@ if defined wget goto wget if not exist "%wget%" goto powershell +echo ==^> Downloading "%url%" to "%filename%" with "wget.exe"... + if not defined PACKER_DEBUG set WGET_OPTS=--no-verbose +if defined http_proxy ( + if defined http_proxy_user if defined http_proxy_password ( + set WGET_OPTS=%WGET_OPTS% --proxy-user='%http_proxy_user%' --proxy-passwd='%http_proxy_password%' + ) +) + "%wget%" --no-check-certificate %WGET_OPTS% -O "%filename%" "%url%" if not errorlevel 1 if exist "%filename%" goto exit0 :powershell -echo ==^> Downloading "%url%" to "%filename%" +echo ==^> Downloading "%url%" to "%filename%" using Powershell... if defined http_proxy ( + set "ps1_proxy=$wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ;" + if defined http_proxy_user if defined http_proxy_password ( + set "ps1_proxy_auth=$wc.proxy.Credentials = (New-Object System.Net.NetworkCredential('%http_proxy_user%', '%http_proxy_password%')) ;" + ) + if defined no_proxy ( - set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.proxy.BypassList = (('%no_proxy%').split(',')) ; $wc.DownloadFile('%url%', '%filename%')" - ) else ( - set ps1_script="$wc = (New-Object System.Net.WebClient) ; $wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ; $wc.DownloadFile('%url%', '%filename%')" + set "ps1_no_proxy=$wc.proxy.BypassList = (('%no_proxy%').split(',')) ;" ) -) else ( - set ps1_script="(New-Object System.Net.WebClient).DownloadFile('%url%', '%filename%')" ) +set ps1_script="$wc = (New-Object System.Net.WebClient) ; %ps1_proxy% %ps1_proxy_auth% %ps1_no_proxy% $wc.DownloadFile('%url%', '%filename%')" + powershell -command %ps1_script% >nul if not errorlevel 1 if exist "%filename%" goto exit0 -if defined DISABLE_BITS ( - if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 -) - :bitsadmin set bitsadmin= @@ -81,7 +88,9 @@ for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i if not defined bitsadmin set bitsadmin=%SystemRoot%\System32\bitsadmin.exe -if not exist "%bitsadmin%" goto powershell +if not exist "%bitsadmin%" goto exit 1 + +echo ==^> Downloading "%url%" to "%filename%" with "BITS"... for %%i in ("%filename%") do set jobname=%%~nxi diff --git a/floppy/_post_update_install.bat b/floppy/_post_update_install.bat index 7fe9a5cd..a682d3cb 100644 --- a/floppy/_post_update_install.bat +++ b/floppy/_post_update_install.bat @@ -9,7 +9,7 @@ REM want to run scripts following all updates/reboots. title Running post update scripts. Please wait... @for %%i in (%~dp0\zz*.cmd) do ( - echo ==^> Running "%%~i" + echo ==^> Running "%%~i" @call "%%~i" ) diff --git a/floppy/disablewinupdate.bat b/floppy/disablewinupdate.bat index 2358b1bd..a5ddbec8 100644 --- a/floppy/disablewinupdate.bat +++ b/floppy/disablewinupdate.bat @@ -13,7 +13,7 @@ SC config wuauserv start= disabled reg add "HKEY_LOCAL_MACHINE\SOFTWARE\Policies\Microsoft\Windows\WindowsUpdate\AU" /v AUOptions /t REG_DWORD /d 2 /f :: turn the whole thing off -reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /t REG_DWORD /d 1 /f +reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate" /v DisableWindowsUpdateAccess /t REG_DWORD /d 0 /f reg add "HKEY_LOCAL_MACHINE\Software\Policies\Microsoft\Windows\WindowsUpdate\AU" /v NoAutoUpdate /t REG_DWORD /d 1 /f :: disable the update prompt scheduled tasks diff --git a/floppy/hotfix-KB2842230.bat b/floppy/hotfix-KB2842230.bat index caaa35f8..be5a828f 100644 --- a/floppy/hotfix-KB2842230.bat +++ b/floppy/hotfix-KB2842230.bat @@ -30,7 +30,6 @@ pushd "%HOTFIX_2842230_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%HOTFIX_2842230_URL%" "%HOTFIX_2842230_PATH%" ) - if errorlevel 1 goto exit1 echo ==^> Extracting Hotfix KB2842230 diff --git a/floppy/upgrade-wua.bat b/floppy/upgrade-wua.bat index 4ac8a74d..9fce7042 100644 --- a/floppy/upgrade-wua.bat +++ b/floppy/upgrade-wua.bat @@ -22,9 +22,6 @@ mkdir "%WUA_DIR%" if exist "%SystemRoot%\_download.cmd" ( call "%SystemRoot%\_download.cmd" "%WUA_URL%" "%WUA_PATH%" -) else ( - echo ==^> Downloading "%WUA_URL%" to "%WUA_PATH%" - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%WUA_URL%', '%WUA_PATH%')" Date: Wed, 26 Feb 2020 09:40:51 -0500 Subject: [PATCH 29/38] sync with proxy --- eval-win10x64-enterprise-cygwin.json | 265 +++++++++++++------------- eval-win10x64-enterprise-ssh.json | 257 +++++++++++++------------ eval-win10x64-enterprise.json | 252 ++++++++++++------------ eval-win10x86-enterprise-cygwin.json | 265 +++++++++++++------------- eval-win10x86-enterprise-ssh.json | 257 +++++++++++++------------ eval-win10x86-enterprise.json | 253 ++++++++++++------------ eval-win2008r2-datacenter-cygwin.json | 218 ++++++++++----------- eval-win2008r2-datacenter-ssh.json | 218 ++++++++++----------- eval-win2008r2-datacenter.json | 221 ++++++++++----------- eval-win2008r2-standard-cygwin.json | 218 ++++++++++----------- eval-win2008r2-standard-ssh.json | 210 ++++++++++---------- eval-win2008r2-standard.json | 213 +++++++++++---------- eval-win2012r2-datacenter-cygwin.json | 226 +++++++++++----------- eval-win2012r2-datacenter-ssh.json | 218 ++++++++++----------- eval-win2012r2-datacenter.json | 221 ++++++++++----------- eval-win2012r2-standard-cygwin.json | 225 +++++++++++----------- eval-win2012r2-standard-ssh.json | 217 ++++++++++----------- eval-win2012r2-standard.json | 221 ++++++++++----------- eval-win2016-standard-cygwin.json | 225 +++++++++++----------- eval-win2016-standard-ssh.json | 217 ++++++++++----------- eval-win2016-standard.json | 221 ++++++++++----------- eval-win7x64-enterprise-cygwin.json | 244 ++++++++++++------------ eval-win7x64-enterprise-ssh.json | 234 ++++++++++++----------- eval-win7x64-enterprise.json | 229 +++++++++++----------- eval-win7x86-enterprise-cygwin.json | 234 ++++++++++++----------- eval-win7x86-enterprise-ssh.json | 225 +++++++++++----------- eval-win7x86-enterprise.json | 221 ++++++++++----------- eval-win81x64-enterprise-cygwin.json | 225 +++++++++++----------- eval-win81x64-enterprise-ssh.json | 226 +++++++++++----------- eval-win81x64-enterprise.json | 239 +++++++++++------------ eval-win81x86-enterprise-cygwin.json | 226 +++++++++++----------- eval-win81x86-enterprise-ssh.json | 218 ++++++++++----------- eval-win81x86-enterprise.json | 221 ++++++++++----------- win2008r2-datacenter-cygwin.json | 218 ++++++++++----------- win2008r2-datacenter-ssh.json | 210 ++++++++++---------- win2008r2-datacenter.json | 213 +++++++++++---------- win2008r2-enterprise-cygwin.json | 218 ++++++++++----------- win2008r2-enterprise-ssh.json | 210 ++++++++++---------- win2008r2-enterprise.json | 213 +++++++++++---------- win2008r2-standard-cygwin.json | 218 ++++++++++----------- win2008r2-standard-ssh.json | 210 ++++++++++---------- win2008r2-standard.json | 213 +++++++++++---------- win2008r2-web-cygwin.json | 218 ++++++++++----------- win2008r2-web-ssh.json | 210 ++++++++++---------- win2008r2-web.json | 213 +++++++++++---------- win2012-datacenter-cygwin.json | 226 +++++++++++----------- win2012-datacenter-ssh.json | 218 ++++++++++----------- win2012-datacenter.json | 221 ++++++++++----------- win2012-standard-cygwin.json | 228 +++++++++++----------- win2012-standard-ssh.json | 218 ++++++++++----------- win2012-standard.json | 221 ++++++++++----------- win2012r2-datacenter-cygwin.json | 218 ++++++++++----------- win2012r2-datacenter-ssh.json | 210 ++++++++++---------- win2012r2-datacenter.json | 211 ++++++++++---------- win2012r2-standard-cygwin.json | 217 ++++++++++----------- win2012r2-standard-ssh.json | 210 ++++++++++---------- win2012r2-standard.json | 211 ++++++++++---------- win2012r2-standardcore-cygwin.json | 218 ++++++++++----------- win2012r2-standardcore-ssh.json | 210 ++++++++++---------- win2012r2-standardcore.json | 211 ++++++++++---------- win2016-standard-cygwin.json | 226 +++++++++++----------- win2016-standard-ssh.json | 218 ++++++++++----------- win2016-standard.json | 221 ++++++++++----------- win7x64-enterprise-cygwin.json | 225 +++++++++++----------- win7x64-enterprise-ssh.json | 217 ++++++++++----------- win7x64-enterprise.json | 213 +++++++++++---------- win7x64-pro-cygwin.json | 226 +++++++++++----------- win7x64-pro-ssh.json | 218 ++++++++++----------- win7x64-pro.json | 213 +++++++++++---------- win7x86-enterprise-cygwin.json | 226 +++++++++++----------- win7x86-enterprise-ssh.json | 218 ++++++++++----------- win7x86-enterprise.json | 213 +++++++++++---------- win7x86-pro-cygwin.json | 226 +++++++++++----------- win7x86-pro-ssh.json | 218 ++++++++++----------- win7x86-pro.json | 213 +++++++++++---------- win81x64-enterprise-cygwin.json | 218 ++++++++++----------- win81x64-enterprise-ssh.json | 210 ++++++++++---------- win81x64-enterprise.json | 211 ++++++++++---------- win81x64-pro-cygwin.json | 217 ++++++++++----------- win81x64-pro-ssh.json | 209 ++++++++++---------- win81x64-pro.json | 211 ++++++++++---------- win81x86-enterprise-cygwin.json | 210 ++++++++++---------- win81x86-enterprise-ssh.json | 202 ++++++++++---------- win81x86-enterprise.json | 205 ++++++++++---------- win81x86-pro-cygwin.json | 211 ++++++++++---------- win81x86-pro-ssh.json | 202 ++++++++++---------- win81x86-pro.json | 205 ++++++++++---------- 87 files changed, 9709 insertions(+), 9485 deletions(-) diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index e7383309..b77c2da3 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -1,189 +1,188 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows9-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win10x64-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows10_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win10x64-enterprise-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win10x64-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win10x64-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win10x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -195,16 +194,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win10x64-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index 6fa9975c..805f2f0f 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -1,185 +1,184 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/openssh.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows9-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win10x64-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/openssh.bat", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows10_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win10x64-enterprise-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/openssh.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win10x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/openssh.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win10x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win10x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -191,16 +190,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win10x64-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index a65840e5..0c2f80e3 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -1,197 +1,201 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows9-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win10x64-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows10_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win10x64-enterprise", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win10x64-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win10x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win10x64-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win10x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x64-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win10x64-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso", + "iso_checksum": "3b5f9494d870726d6d8a833aaf6169a964b8a9be", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index beff8b50..1392230c 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -1,189 +1,188 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows9", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win10x86-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows10", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win10x86-enterprise-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win10x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win10x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win10x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -195,16 +194,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win10x86-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso", + "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index 475f75bb..1164be6c 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -1,185 +1,184 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/openssh.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows9", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win10x86-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/openssh.bat", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows10", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win10x86-enterprise-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/openssh.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win10x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/openssh.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win10x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win10x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -191,16 +190,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win10x86-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso", + "iso_checksum": "4a75747a47eb689497fe57d64cec375c7949aa97", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index 07086afd..69642454 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -1,198 +1,201 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows9", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win10x86-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows81", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win10x86-enterprise", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win10x86-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/slim_win10.bat", - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/_post_update_install.bat", - "floppy/autologon.bat", - "floppy/disablewinupdate.bat", - "floppy/eval-win10x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win10x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/_post_update_install.bat", + "{{template_dir}}/floppy/autologon.bat", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/slim_win10.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win10x86-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win10x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win10x86-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win10x86-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win10x86-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/6/5/D/65D18931-F626-4A35-AD5B-F5DA41FE6B76/16299.15.170928-1534.rs3_release_CLIENTENTERPRISEEVAL_OEMRET_x86FRE_en-us.iso", + "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 9acd6060..5a5eff7a 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2008r2-datacenter-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win2008r2-datacenter-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2008r2-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2008r2-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2008r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2008r2-datacenter", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index 84670f57..6fc212f7 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/upgrade-wua.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2008r2-datacenter-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/upgrade-wua.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win2008r2-datacenter-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/upgrade-wua.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2008r2-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/upgrade-wua.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2008r2-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2008r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2008r2-datacenter", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index 56136cd0..e2a00adb 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -1,177 +1,180 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/upgrade-wua.bat", - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2008r2-datacenter", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/upgrade-wua.bat", - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win2008r2-datacenter", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/upgrade-wua.bat", - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win2008r2-datacenter", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/upgrade-wua.bat", - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win2008r2-datacenter", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2008r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-datacenter.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-datacenter.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2008r2-datacenter", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index efa8325c..462cd29b 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2008r2-standard-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win2008r2-standard-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2008r2-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2008r2-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2008r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-standard-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2008r2-standard", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index 7ca6d538..4c12bd6b 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -1,156 +1,155 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2008r2-standard-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win2008r2-standard-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2008r2-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2008r2-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2008r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -162,18 +161,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2008r2-standard", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index b575586b..9ccefc1b 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -1,173 +1,176 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2008r2-standard", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win2008r2-standard", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win2008r2-standard", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win2008r2-standard", + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2008r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-standard.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2008r2-standard.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2008r2-standard", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/7/5/E/75EC4E54-5B02-42D6-8879-D8D3A25FBEF7/7601.17514.101119-1850_x64fre_server_eval_en-us-GRMSXEVAL_EN_DVD.iso", + "iso_checksum": "beed231a34e90e1dd9a04b3afabec31d62ce3889", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index 484543d3..4423610b 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -1,106 +1,106 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2012r2-datacenter-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2012r2-datacenter-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -109,69 +109,68 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2012r2-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2012r2-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2012r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-datacenter-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-datacenter-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -183,18 +182,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2012r2-datacenter", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index c3403a97..cf223c38 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -1,103 +1,103 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2012r2-datacenter-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2012r2-datacenter-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -106,68 +106,67 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2012r2-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2012r2-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2012r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -179,18 +178,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2012r2-datacenter", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index 270bee26..c9555de5 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -1,106 +1,106 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2012r2-datacenter", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1", - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2012r2-datacenter", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -109,82 +109,85 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win2012r2-datacenter", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2012r2-datacenter/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win2012r2-datacenter", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2012r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-datacenter.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-datacenter.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2012r2-datacenter", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index de19a022..8fea4224 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -1,106 +1,106 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2012r2-standard-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2012r2-standard-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -109,69 +109,68 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2012r2-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2012r2-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2012r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-standard-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-standard-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -183,16 +182,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2012r2-standard", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index 362a5262..46e2be0a 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -1,103 +1,103 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2012r2-standard-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2012r2-standard-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -106,68 +106,67 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2012r2-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2012r2-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2012r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -179,16 +178,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2012r2-standard", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index 89bf9566..d30c4b06 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -1,106 +1,106 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2012r2-standard", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2012r2-standard", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -109,82 +109,85 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win2012r2-standard", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2012r2-standard/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win2012r2-standard", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win2012r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-standard.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2012r2-standard.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2012r2-standard", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "hw_version": "7", "iso_url": "http://download.microsoft.com/download/6/2/A/62A76ABB-9990-4EFC-A4FE-C7D698DAEB96/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_SERVER_EVAL_EN-US-IR3_SSS_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "849734f37346385dac2c101e4aacba4626bb141c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index 35dbe5d2..41a4a7cb 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -1,106 +1,106 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2016-standard-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2016_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2016-standard-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2016", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -109,69 +109,68 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2016-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2016-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": true, - "output": "box/{{.Provider}}/eval-win2016-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2016-standard-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2016-standard-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -183,16 +182,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2016-standard", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", + "hw_version": "7", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", + "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index c7b68cee..9bd167ba 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -1,103 +1,103 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2016-standard-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2016_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2016-standard-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2016", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -106,68 +106,67 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win2016-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win2016-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": true, - "output": "box/{{.Provider}}/eval-win2016-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2016-standard-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2016-standard-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -179,16 +178,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2016-standard", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", + "hw_version": "7", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", + "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index d9dddcb5..ce98548d 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -1,106 +1,106 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win2016-standard", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2016_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win2016-standard", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2016", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -109,82 +109,85 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win2016-standard", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win2016-standard/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win2016-standard", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": true, - "output": "box/{{.Provider}}/eval-win2016-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win2016-standard.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win2016-standard.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win2016-standard", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", + "hw_version": "7", "iso_url": "https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO", + "iso_checksum": "772700802951b36c8cb26a61c040b9a8dc3816a3", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index d3edd9c0..aa3f1036 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -1,168 +1,167 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win7x64-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win7x64-enterprise-cygwin" + "hard_drive_interface": "sata", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", "ssh_password": "vagrant", + "ssh_timeout": "10000s" + }, + { + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], + "shutdown_command": "{{ user `shutdown_command`}}", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win7x64-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win7x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win7x64-enterprise-cygwin.tpl" - }, - { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win7x64-enterprise-cygwin" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x64-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -174,18 +173,21 @@ } ], "variables": { - "cpus": "2", - "memory": "3072", - "guest_additions_url": "", + "vm_name": "eval-win7x64-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "3072", "disk_size": "40960", - "headless": "false", - "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", + "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index 3ae8441e..a57d6d34 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -1,168 +1,167 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/upgrade-wua.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win7x64-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/upgrade-wua.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win7x64-enterprise-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/upgrade-wua.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win7x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/upgrade-wua.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win7x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win7x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -174,18 +173,21 @@ } ], "variables": { - "cpus": "2", - "memory": "3072", - "guest_additions_url": "", + "vm_name": "eval-win7x64-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "3072", "disk_size": "40960", - "headless": "false", - "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", + "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index 12933169..a4eda71d 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -1,181 +1,184 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/upgrade-wua.bat", - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win7x64-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/upgrade-wua.bat", - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win7x64-enterprise", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/upgrade-wua.bat", - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win7x64-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "20000s", - "winrm_username": "vagrant" + "winrm_timeout": "20000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/upgrade-wua.bat", - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/upgrade-wua.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win7x64-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win7x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win7x64-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x64-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "3072", - "guest_additions_url": "", + "vm_name": "eval-win7x64-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "3072", "disk_size": "40960", - "headless": "false", - "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", + "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index bb64d25a..47ba7622 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -1,168 +1,167 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win7x86-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win7x86-enterprise-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win7x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win7x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win7x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x86-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -174,18 +173,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win7x86-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", + "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index 2d6d844d..5ab14885 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -1,163 +1,163 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win7x86-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win7x86-enterprise-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win7x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win7x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win7x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -169,18 +169,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win7x86-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", + "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index 61dc103c..e658dd5d 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -1,177 +1,180 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win7x86-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "eval-win7x86-enterprise", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win7x86-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win7x86-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win7x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win7x86-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win7x86-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x86/EN/7600.16385.090713-1255_x86fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENEVAL_EN_DVD.iso", + "iso_checksum": "971fc00183a52c152fe924a6b99fdec011a871c2", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index 3caaec26..2dc1ca79 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -1,169 +1,168 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows9-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win81x64-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win81x64-enterprise-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win81x64-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win81x64-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win81x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win81x64-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x64-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -175,16 +174,20 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win81x64-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index 0df0912a..f1a0b405 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -1,169 +1,168 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/update.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win81x64-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/update.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win81x64-enterprise-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/update.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win81x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/update.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win81x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win81x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -175,18 +174,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win81x64-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index c17a2bea..d1300184 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -1,186 +1,189 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win81x64-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win81x64-enterprise", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", + "winrm_password": "vagrant", + "winrm_timeout": "10000s" + }, + { + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/update.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win81x64-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win81x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win81x64-enterprise.tpl" - }, - { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win81x64-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/update.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win81x64-enterprise", - "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x64-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win81x64-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X64FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X64FREE_EN-US_DV9.ISO", + "iso_checksum": "7c7d99546077c805faae40a8864882c46f0ca141", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index 6b7df223..f4dab180 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -1,169 +1,168 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win81x86-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win81x86-enterprise-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win81x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win81x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win81x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win81x86-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x86-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -175,18 +174,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win81x86-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X86FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X86FREE_EN-US_DV9.ISO", + "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index 6f04ce41..dac83d44 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -1,165 +1,164 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win81x86-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win81x86-enterprise-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "eval-win81x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/disablewinupdate.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "eval-win81x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win81x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -171,18 +170,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win81x86-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X86FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X86FREE_EN-US_DV9.ISO", + "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index af43f64b..0532632a 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -1,182 +1,185 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "eval-win81x86-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1", - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "eval-win81x86-enterprise", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "eval-win81x86-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/eval-win81x86-enterprise/Autounattend.xml", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/eval-win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "eval-win81x86-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/eval-win81x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-eval-win81x86-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-eval-win81x86-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "eval-win81x86-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/B/9/9/B999286E-0A47-406D-8B3D-5B5AD7373A4A/9600.17050.WINBLUE_REFRESH.140317-1640_X86FRE_ENTERPRISE_EVAL_EN-US-IR3_CENA_X86FREE_EN-US_DV9.ISO", + "iso_checksum": "4ddd0881779e89d197cb12c684adf47fd5d9e540", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json index c41e37c9..bbece9ac 100644 --- a/win2008r2-datacenter-cygwin.json +++ b/win2008r2-datacenter-cygwin.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-datacenter-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-datacenter-cygwin" + "hard_drive_interface": "sata", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2008r2-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2008r2-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-datacenter-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-datacenter-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-datacenter", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json index 08ea7573..e9ea8ded 100644 --- a/win2008r2-datacenter-ssh.json +++ b/win2008r2-datacenter-ssh.json @@ -1,156 +1,155 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-datacenter-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-datacenter-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2008r2-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2008r2-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-datacenter-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-datacenter-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -162,18 +161,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-datacenter", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json index 28e39b7c..e3bac200 100644 --- a/win2008r2-datacenter.json +++ b/win2008r2-datacenter.json @@ -1,172 +1,175 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-datacenter", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-datacenter", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2008r2-datacenter", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2008r2-datacenter", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-datacenter.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-datacenter.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-datacenter", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2008r2-enterprise-cygwin.json b/win2008r2-enterprise-cygwin.json index 3535369f..13dea3f7 100644 --- a/win2008r2-enterprise-cygwin.json +++ b/win2008r2-enterprise-cygwin.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-enterprise-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2008r2-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2008r2-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json index a9ef8d2f..e2464f25 100644 --- a/win2008r2-enterprise-ssh.json +++ b/win2008r2-enterprise-ssh.json @@ -1,156 +1,155 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-enterprise-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2008r2-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2008r2-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -162,18 +161,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json index a111d52c..81de15a0 100644 --- a/win2008r2-enterprise.json +++ b/win2008r2-enterprise.json @@ -1,172 +1,175 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-enterprise", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2008r2-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2008r2-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2008r2-standard-cygwin.json b/win2008r2-standard-cygwin.json index 3c8bbcf7..5fd4f1a5 100644 --- a/win2008r2-standard-cygwin.json +++ b/win2008r2-standard-cygwin.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-standard-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-standard-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2008r2-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2008r2-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-standard-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-standard-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-standard", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json index edcfc136..2090891f 100644 --- a/win2008r2-standard-ssh.json +++ b/win2008r2-standard-ssh.json @@ -1,156 +1,155 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-standard-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-standard-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2008r2-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2008r2-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-standard-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-standard-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -162,18 +161,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-standard", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2008r2-standard.json b/win2008r2-standard.json index 440ce708..85924118 100644 --- a/win2008r2-standard.json +++ b/win2008r2-standard.json @@ -1,172 +1,175 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-standard", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-standard", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2008r2-standard", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2008r2-standard", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-standard.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-standard.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-standard", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json index 77f27943..1de6cd6f 100644 --- a/win2008r2-web-cygwin.json +++ b/win2008r2-web-cygwin.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-web/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-web-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-web/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-web-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-web/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2008r2-web-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-web/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2008r2-web-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-web-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-web-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-web-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-web", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2008r2-web-ssh.json b/win2008r2-web-ssh.json index 5baa9eba..990e56ae 100644 --- a/win2008r2-web-ssh.json +++ b/win2008r2-web-ssh.json @@ -1,156 +1,155 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-web/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-web-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-web/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-web-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2008r2-web/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2008r2-web-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2008r2-web/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/disablewinupdate.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2008r2-web-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-web-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-web-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-web-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -162,18 +161,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-web", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2008r2-web.json b/win2008r2-web.json index 215f773a..93d5bfb2 100644 --- a/win2008r2-web.json +++ b/win2008r2-web.json @@ -1,172 +1,175 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-web/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2008r2-web", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-web/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2008_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2008r2-web", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-web/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2008", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2008r2-web", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/disablewinupdate.bat", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2008r2-web/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2008r2-web/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/disablewinupdate.bat", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2008r2-web", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2008r2-web-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2008r2-web.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2008r2-web.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2008r2-web", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "hw_version": "7", "iso_url": "iso/en_windows_server_2008_r2_with_sp1_vl_build_x64_dvd_617403.iso", + "iso_checksum": "7e7e9425041b3328ccf723a0855c2bc4f462ec57", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json index 784021f5..0265c188 100644 --- a/win2012-datacenter-cygwin.json +++ b/win2012-datacenter-cygwin.json @@ -1,100 +1,100 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012-datacenter-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2012-datacenter-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -103,70 +103,69 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012-datacenter-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-datacenter-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -178,18 +177,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012-datacenter", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso", + "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json index 95ff0edd..1e202417 100644 --- a/win2012-datacenter-ssh.json +++ b/win2012-datacenter-ssh.json @@ -1,97 +1,97 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012-datacenter-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2012-datacenter-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -100,69 +100,68 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012-datacenter-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-datacenter-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -174,18 +173,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012-datacenter", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso", + "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012-datacenter.json b/win2012-datacenter.json index 2b6c87af..a4447fe7 100644 --- a/win2012-datacenter.json +++ b/win2012-datacenter.json @@ -1,99 +1,99 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/hotfix-KB2842230.bat", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012-datacenter", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/hotfix-KB2842230.bat", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2012-datacenter", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/hotfix-KB2842230.bat", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -102,83 +102,86 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2012-datacenter", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/hotfix-KB2842230.bat", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2012-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2012-datacenter", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012-datacenter.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-datacenter.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012-datacenter", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso", + "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2012-standard-cygwin.json b/win2012-standard-cygwin.json index 4ced0553..3d22b2f0 100644 --- a/win2012-standard-cygwin.json +++ b/win2012-standard-cygwin.json @@ -1,102 +1,100 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012-standard-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1", - "memsize": "{{ user `memory` }}", - "numvcpus": "{{ user `cpus` }}" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2012-standard-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -105,70 +103,69 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012-standard-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-standard-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -180,18 +177,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012-standard", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso", + "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012-standard-ssh.json b/win2012-standard-ssh.json index 56b4d543..831a135c 100644 --- a/win2012-standard-ssh.json +++ b/win2012-standard-ssh.json @@ -1,97 +1,97 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012-standard-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2012-standard-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -100,69 +100,68 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/hotfix-KB2842230.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012-standard-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-standard-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -174,18 +173,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012-standard", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso", + "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012-standard.json b/win2012-standard.json index 8373ad7c..13b77aa5 100644 --- a/win2012-standard.json +++ b/win2012-standard.json @@ -1,99 +1,99 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/hotfix-KB2842230.bat", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2012-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012-standard", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/hotfix-KB2842230.bat", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2012-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win2012-standard", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/hotfix-KB2842230.bat", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2012-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -102,83 +102,86 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2012-standard", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/hotfix-KB2842230.bat", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2012-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/hotfix-KB2842230.bat", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2012-standard", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012-standard.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012-standard.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012-standard", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_x64_dvd_915478.iso", + "iso_checksum": "d09e752b1ee480bc7e93dfa7d5c3a9b8aac477ba", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json index 506b13a6..0214bb6e 100644 --- a/win2012r2-datacenter-cygwin.json +++ b/win2012r2-datacenter-cygwin.json @@ -1,103 +1,103 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-datacenter-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-datacenter-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -106,68 +106,67 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012r2-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/cygwin.sh", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012r2-datacenter-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-datacenter-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-datacenter-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-datacenter-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -179,18 +178,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-datacenter", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso", + "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json index 3ae8ec4a..9df13cb4 100644 --- a/win2012r2-datacenter-ssh.json +++ b/win2012r2-datacenter-ssh.json @@ -1,100 +1,100 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-datacenter-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-datacenter-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -103,67 +103,66 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012r2-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012r2-datacenter-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-datacenter-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-datacenter-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -175,18 +174,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-datacenter", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso", + "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json index 074e7957..6ef75463 100644 --- a/win2012r2-datacenter.json +++ b/win2012r2-datacenter.json @@ -1,102 +1,102 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-datacenter", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-datacenter", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -105,81 +105,84 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2012r2-datacenter", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-datacenter/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-datacenter/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2012r2-datacenter", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-datacenter.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-datacenter.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-datacenter", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso", + "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json index 8aeb7fda..65a3fc32 100644 --- a/win2012r2-standard-cygwin.json +++ b/win2012r2-standard-cygwin.json @@ -1,103 +1,103 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/powerconfig.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-standard-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-standard-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -106,67 +106,67 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012r2-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012r2-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-standard-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standard-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -178,18 +178,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-standard", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_4065220.iso", + "iso_checksum": "af9ef225a510d6d51c5520396452d4f1c1e06935", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json index a980b4e8..0fa37660 100644 --- a/win2012r2-standard-ssh.json +++ b/win2012r2-standard-ssh.json @@ -1,100 +1,100 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-standard-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-standard-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -103,67 +103,66 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012r2-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012r2-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-standard-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standard-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -175,18 +174,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-standard", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso", + "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012r2-standard.json b/win2012r2-standard.json index 787860c7..d24b2bef 100644 --- a/win2012r2-standard.json +++ b/win2012r2-standard.json @@ -1,102 +1,102 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-standard", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-standard", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2012", - "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -105,81 +105,84 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2012r2-standard", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2012r2-standard", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-standard.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standard.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-standard", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso", + "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json index 456a8e3c..c894314a 100644 --- a/win2012r2-standardcore-cygwin.json +++ b/win2012r2-standardcore-cygwin.json @@ -1,103 +1,103 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/powerconfig.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-standardcore-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-standardcore-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -106,68 +106,67 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012r2-standardcore-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012r2-standardcore-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-standardcore-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-standardcore-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standardcore-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -179,18 +178,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-standardcore", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso", + "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json index 3d94a9f1..cbdf5c1d 100644 --- a/win2012r2-standardcore-ssh.json +++ b/win2012r2-standardcore-ssh.json @@ -1,100 +1,100 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-standardcore", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-standardcore" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -103,67 +103,66 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2012r2-standardcore" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2012r2-standardcore-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-standardcore-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-standardcore.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standardcore.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -175,18 +174,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-standardcore", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso", + "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json index b3c1dd0a..cb5e4c85 100644 --- a/win2012r2-standardcore.json +++ b/win2012r2-standardcore.json @@ -1,102 +1,102 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2012r2-standardcore", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2012_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2012r2-standardcore", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2012", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -105,81 +105,84 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2012r2-standardcore", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win2012r2-standardcore/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2012r2-standardcore/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2012r2-standardcore", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win2012r2-standardcore-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2012r2-standardcore.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2012r2-standardcore.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2012r2-standardcore", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "hw_version": "7", "iso_url": "iso/en_windows_server_2012_r2_with_update_x64_dvd_6052708.iso", + "iso_checksum": "865494e969704be1c4496d8614314361d025775e", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json index e8aaa8d0..2cec3f29 100644 --- a/win2016-standard-cygwin.json +++ b/win2016-standard-cygwin.json @@ -1,106 +1,106 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/unzip.vbs", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2016-standard-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/unzip.vbs", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2016_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2016-standard-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/unzip.vbs", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2016", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -109,69 +109,68 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2016-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.bat", - "floppy/cygwin.sh", - "floppy/unzip.vbs", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2016-standard-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": true, - "output": "box/{{.Provider}}/win2016-standard-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2016-standard-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2016-standard-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -183,18 +182,21 @@ } ], "variables": { - "cpus": "2", - "memory": "{{ user `memory` }}", - "guest_additions_url": "", + "vm_name": "win2016-standard", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616", + "hw_version": "7", "iso_url": "iso/en_windows_server_2016_x64_dvd_9718492.iso", + "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json index f13b5fa5..642d8555 100644 --- a/win2016-standard-ssh.json +++ b/win2016-standard-ssh.json @@ -1,103 +1,103 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2016-standard-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2016_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2016-standard-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-2016", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -106,68 +106,67 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win2016-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win2016-standard/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/unzip.vbs", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win2016-standard-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": true, - "output": "box/{{.Provider}}/win2016-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2016-standard-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2016-standard-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -179,18 +178,21 @@ } ], "variables": { - "cpus": "2", - "memory": "{{ user `memory` }}", - "guest_additions_url": "", + "vm_name": "win2016-standard", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616", + "hw_version": "7", "iso_url": "iso/en_windows_server_2016_x64_dvd_9718492.iso", + "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win2016-standard.json b/win2016-standard.json index 19274fb7..a2c77baf 100644 --- a/win2016-standard.json +++ b/win2016-standard.json @@ -1,106 +1,106 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2016-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8srv-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win2016-standard", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2016-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows2016_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win2016-standard", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2016-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-2016", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "prlctl": [ [ "set", @@ -109,82 +109,85 @@ "off" ] ], - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win2016-standard", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/unzip.vbs", - "floppy/win2016-standard/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win2016-standard/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/unzip.vbs", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win2016-standard", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": true, - "output": "box/{{.Provider}}/win2016-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win2016-standard.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win2016-standard.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win2016-standard", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616", + "hw_version": "7", "iso_url": "iso/en_windows_server_2016_x64_dvd_9718492.iso", + "iso_checksum": "f185197af68fae4f0e06510a4579fc511ba27616", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win7x64-enterprise-cygwin.json b/win7x64-enterprise-cygwin.json index 7c7a5b59..b539bdc4 100644 --- a/win7x64-enterprise-cygwin.json +++ b/win7x64-enterprise-cygwin.json @@ -1,161 +1,163 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command` }}", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command` }}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x64-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x64-enterprise-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win7x64-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win7x64-enterprise-cygwin" + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x64-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -167,18 +169,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x64-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", + "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json index 12898ac3..ed23acb6 100644 --- a/win7x64-enterprise-ssh.json +++ b/win7x64-enterprise-ssh.json @@ -1,157 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x64-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x64-enterprise-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win7x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win7x64-enterprise-ssh" + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x64-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -163,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x64-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", + "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json index e8fc11ad..c651511a 100644 --- a/win7x64-enterprise.json +++ b/win7x64-enterprise.json @@ -1,172 +1,175 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x64-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x64-enterprise", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win7x64-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win7x64-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x64-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x64-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "hw_version": "7", "iso_url": "http://care.dlservice.microsoft.com/dl/download/evalx/win7/x64/EN/7600.16385.090713-1255_x64fre_enterprise_en-us_EVAL_Eval_Enterprise-GRMCENXEVAL_EN_DVD.iso", + "iso_checksum": "15ddabafa72071a06d5213b486a02d5b55cb7070", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win7x64-pro-cygwin.json b/win7x64-pro-cygwin.json index ff08385c..fdd9fcde 100644 --- a/win7x64-pro-cygwin.json +++ b/win7x64-pro-cygwin.json @@ -1,164 +1,163 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x64-pro-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x64-pro-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win7x64-pro-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win7x64-pro-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x64-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x64-pro-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-pro-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -170,18 +169,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x64-pro", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c", + "hw_version": "7", "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso", + "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win7x64-pro-ssh.json b/win7x64-pro-ssh.json index f7ce68de..1cb9808f 100644 --- a/win7x64-pro-ssh.json +++ b/win7x64-pro-ssh.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x64-pro-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x64-pro-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win7x64-pro-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win7x64-pro-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x64-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x64-pro-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-pro-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x64-pro", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c", + "hw_version": "7", "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso", + "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win7x64-pro.json b/win7x64-pro.json index 73d2d6eb..d77d25b1 100644 --- a/win7x64-pro.json +++ b/win7x64-pro.json @@ -1,172 +1,175 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x64-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x64-pro", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x64-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x64-pro", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x64-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win7x64-pro", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x64-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win7x64-pro", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x64-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x64-pro.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x64-pro.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x64-pro", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c", + "hw_version": "7", "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x64_dvd_u_677791.iso", + "iso_checksum": "708e0338d4e2f094dfeb860347c84a6ed9e91d0c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win7x86-enterprise-cygwin.json b/win7x86-enterprise-cygwin.json index 183c3ebd..818366f6 100644 --- a/win7x86-enterprise-cygwin.json +++ b/win7x86-enterprise-cygwin.json @@ -1,164 +1,163 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x86-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x86-enterprise-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win7x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win7x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x86-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -170,18 +169,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x86-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c", + "hw_version": "7", "iso_url": "iso/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso", + "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win7x86-enterprise-ssh.json b/win7x86-enterprise-ssh.json index ce941b06..f2197a9f 100644 --- a/win7x86-enterprise-ssh.json +++ b/win7x86-enterprise-ssh.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x86-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x86-enterprise-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win7x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win7x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x86-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x86-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c", + "hw_version": "7", "iso_url": "iso/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso", + "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json index 3898b081..8233ced5 100644 --- a/win7x86-enterprise.json +++ b/win7x86-enterprise.json @@ -1,172 +1,175 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x86-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x86-enterprise", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win7x86-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win7x86-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x86-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x86-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c", + "hw_version": "7", "iso_url": "iso/en_windows_7_enterprise_with_sp1_x86_dvd_u_677710.iso", + "iso_checksum": "4e0450ac73ab6f9f755eb422990cd9c7a1f3509c", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win7x86-pro-cygwin.json b/win7x86-pro-cygwin.json index d9019441..016b1b7a 100644 --- a/win7x86-pro-cygwin.json +++ b/win7x86-pro-cygwin.json @@ -1,164 +1,163 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x86-pro-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x86-pro-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win7x86-pro-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win7x86-pro-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x86-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x86-pro-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-pro-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -170,18 +169,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x86-pro", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075", + "hw_version": "7", "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso", + "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win7x86-pro-ssh.json b/win7x86-pro-ssh.json index 65ee4537..06297497 100644 --- a/win7x86-pro-ssh.json +++ b/win7x86-pro-ssh.json @@ -1,160 +1,159 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x86-pro-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x86-pro-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win7x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win7x86-pro-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win7x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/fixnetwork.ps1", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/networkprompt.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win7x86-pro-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x86-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x86-pro-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-pro-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -166,18 +165,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x86-pro", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075", + "hw_version": "7", "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso", + "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win7x86-pro.json b/win7x86-pro.json index 69f6264b..8a0f5d47 100644 --- a/win7x86-pro.json +++ b/win7x86-pro.json @@ -1,172 +1,175 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows7", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win7x86-pro", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows7", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win7x86-pro", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-7", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win7x86-pro", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/networkprompt.bat", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win7x86-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win7x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/networkprompt.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win7x86-pro", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win7x86-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win7x86-pro.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win7x86-pro.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win7x86-pro", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075", + "hw_version": "7", "iso_url": "iso/en_windows_7_professional_with_sp1_vl_build_x86_dvd_u_677896.iso", + "iso_checksum": "d5bd65e1b326d728f4fd146878ee0d9a3da85075", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json index a16c2d86..70a7084b 100644 --- a/win81x64-enterprise-cygwin.json +++ b/win81x64-enterprise-cygwin.json @@ -1,165 +1,164 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x64-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win81x64-enterprise-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win81x64-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win81x64-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x64-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x64-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -171,18 +170,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x64-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_enterprise_with_update_x64_dvd_4065178.iso", + "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json index 6e8ebca4..f2b1d6b5 100644 --- a/win81x64-enterprise-ssh.json +++ b/win81x64-enterprise-ssh.json @@ -1,161 +1,160 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x64-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win81x64-enterprise-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win81x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win81x64-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x64-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -167,18 +166,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x64-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_enterprise_with_update_x64_dvd_4065178.iso", + "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json index c1456e32..631fd5c0 100644 --- a/win81x64-enterprise.json +++ b/win81x64-enterprise.json @@ -1,177 +1,180 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x64-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win81x64-enterprise", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win81x64-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x64-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x64-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win81x64-enterprise", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x64-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x64-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_enterprise_with_update_x64_dvd_4065178.iso", + "iso_checksum": "8fb332a827998f807a1346bef55969c6519668b9", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json index 33672451..af194b8a 100644 --- a/win81x64-pro-cygwin.json +++ b/win81x64-pro-cygwin.json @@ -1,162 +1,164 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x64-pro-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win81x64-pro-cygwin" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win81x64-pro-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win81x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win81x64-pro-cygwin" + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x64-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x64-pro-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-pro-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -168,18 +170,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x64-pro", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x64_dvd_4065194.iso", + "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json index df759d04..566d461d 100644 --- a/win81x64-pro-ssh.json +++ b/win81x64-pro-ssh.json @@ -1,158 +1,160 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x64-pro-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "post_shutdown_delay": "30s", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win81x64-pro-ssh" + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win81x64-pro-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win81x64-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win81x64-pro-ssh" + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x64-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x64-pro-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-pro-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -164,18 +166,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x64-pro", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x64_dvd_4065194.iso", + "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win81x64-pro.json b/win81x64-pro.json index 56f6ed78..eecc08cf 100644 --- a/win81x64-pro.json +++ b/win81x64-pro.json @@ -1,177 +1,180 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x64-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8-64", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x64-pro", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x64-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8_64", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", - "cpus": "{{ user `cpus` }}", - "memory": "{{ user `memory` }}", "vboxmanage": [ [ "setextradata", "{{.Name}}", - "VBoxInternal/CPUM/CMPXCHG16B", + "VBoxInternal/CPUM/IsaExts/CMPXCHG16B", "1" ] ], - "vm_name": "win81x64-pro", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x64-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win81x64-pro", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x64-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x64-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win81x64-pro", + "communicator": "winrm", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x64-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x64-pro.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x64-pro.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x64-pro", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x64_dvd_4065194.iso", + "iso_checksum": "e50a6f0f08e933f25a71fbc843827fe752ed0365", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json index b8f2510b..51705cbe 100644 --- a/win81x86-enterprise-cygwin.json +++ b/win81x86-enterprise-cygwin.json @@ -1,157 +1,156 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x86-enterprise-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win81x86-enterprise-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win81x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win81x86-enterprise-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x86-enterprise-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x86-enterprise-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-enterprise-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -163,18 +162,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x86-enterprise", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_enterprise_with_update_x86_dvd_4065185.iso", + "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win81x86-enterprise-ssh.json b/win81x86-enterprise-ssh.json index b8a1b3bf..486ebd1d 100644 --- a/win81x86-enterprise-ssh.json +++ b/win81x86-enterprise-ssh.json @@ -1,153 +1,152 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x86-enterprise-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win81x86-enterprise-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win81x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win81x86-enterprise-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x86-enterprise-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-enterprise-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -159,18 +158,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x86-enterprise", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_enterprise_with_update_x86_dvd_4065185.iso", + "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json index 42596ccd..55b6d33e 100644 --- a/win81x86-enterprise.json +++ b/win81x86-enterprise.json @@ -1,169 +1,172 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x86-enterprise", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win81x86-enterprise", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win81x86-enterprise", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x86-enterprise/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x86-enterprise/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win81x86-enterprise", + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x86-enterprise.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-enterprise.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x86-enterprise", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_enterprise_with_update_x86_dvd_4065185.iso", + "iso_checksum": "fe43558b4708b4b786bc3286924813b0aad21106", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } diff --git a/win81x86-pro-cygwin.json b/win81x86-pro-cygwin.json index 98fd12c1..90573714 100644 --- a/win81x86-pro-cygwin.json +++ b/win81x86-pro-cygwin.json @@ -1,158 +1,156 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x86-pro-cygwin", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win81x86-pro-cygwin" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win81x86-pro-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win81x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/cygwin.sh", - "floppy/cygwin.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/cygwin.bat", + "{{template_dir}}/floppy/cygwin.sh", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "headless": "{{ user `headless` }}", + "cpus": "{{ user `cpus` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win81x86-pro-cygwin" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x86-pro-cygwin-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x86-pro-cygwin.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-pro-cygwin.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c $(/bin/cygpath -m '{{.Path}}')", "remote_path": "C:/Windows/Temp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -164,18 +162,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x86-pro", + "vm_suffix": "-cygwin", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x86_dvd_4065201.iso", + "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win81x86-pro-ssh.json b/win81x86-pro-ssh.json index 4990701f..87ada8f4 100644 --- a/win81x86-pro-ssh.json +++ b/win81x86-pro-ssh.json @@ -1,153 +1,152 @@ { "builders": [ { - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x86-pro-ssh", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - } + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd", - "floppy/oracle-cert.cer" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "post_shutdown_delay": "30s", - "ssh_password": "vagrant", - "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win81x86-pro-ssh" + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "ssh_username": "vagrant", + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/win81x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_wait_timeout": "10000s", - "type": "parallels-iso", - "vm_name": "win81x86-pro-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" }, { - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/win81x86-pro/Autounattend.xml", - "floppy/00-run-all-scripts.cmd", - "floppy/install-winrm.cmd", - "floppy/powerconfig.bat", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/passwordchange.bat", - "floppy/openssh.bat", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/openssh.bat", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "ssh_password": "vagrant", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", "ssh_username": "vagrant", - "ssh_timeout": "10000s", - "type": "hyperv-iso", - "vm_name": "win81x86-pro-ssh" + "ssh_password": "vagrant", + "ssh_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x86-pro-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x86-pro-ssh.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-pro-ssh.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "execute_command": "{{.Vars}} cmd /c C:/Windows/Temp/script.bat", "remote_path": "/tmp/script.bat", "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "shell" }, @@ -159,18 +158,21 @@ } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x86-pro", + "vm_suffix": "-ssh", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x86_dvd_4065201.iso", + "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c 'Packer Shutdown'", + "headless": "false", "update": "true", "version": "0.1.0" } } - diff --git a/win81x86-pro.json b/win81x86-pro.json index 5f717d66..86723dc2 100644 --- a/win81x86-pro.json +++ b/win81x86-pro.json @@ -1,169 +1,172 @@ { "builders": [ { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "vmware-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x86-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "windows8", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", "tools_upload_flavor": "windows", - "type": "vmware-iso", - "vm_name": "win81x86-pro", + "version": "{{ user `hw_version` }}", "cpus": "{{ user `cpus` }}", + "cores": 1, "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", "disk_adapter_type": "lsisas1068", - "vmx_data": { - "cpuid.coresPerSocket": "1" - }, + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "virtualbox-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/oracle-cert.cer", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x86-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_additions_mode": "attach", "guest_additions_url": "{{user `guest_additions_url`}}", "guest_os_type": "Windows8", - "hard_drive_interface": "sata", "headless": "{{ user `headless` }}", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "virtualbox-iso", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "vm_name": "win81x86-pro", + "disk_size": "{{user `disk_size`}}", + "hard_drive_interface": "sata", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "disk_size": "{{user `disk_size`}}", + "type": "parallels-iso", + "iso_url": "{{ user `iso_url` }}", + "iso_checksum": "{{ user `iso_checksum` }}", + "iso_checksum_type": "sha1", "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x86-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" ], + "shutdown_command": "{{ user `shutdown_command`}}", + "communicator": "winrm", "guest_os_type": "win-8.1", - "iso_checksum": "{{ user `iso_checksum` }}", - "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", "parallels_tools_flavor": "win", "cpus": "{{ user `cpus` }}", "memory": "{{ user `memory` }}", - "shutdown_command": "{{ user `shutdown_command`}}", - "type": "parallels-iso", - "vm_name": "win81x86-pro", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" }, { - "communicator": "winrm", - "cpu": "{{ user `cpus` }}", - "disk_size": "{{user `disk_size`}}", - "floppy_files": [ - "floppy/00-run-all-scripts.cmd", - "floppy/01-install-wget.cmd", - "floppy/_download.cmd", - "floppy/_packer_config.cmd", - "floppy/fixnetwork.ps1", - "floppy/install-winrm.cmd", - "floppy/passwordchange.bat", - "floppy/powerconfig.bat", - "floppy/win81x86-pro/Autounattend.xml", - "floppy/zz-start-transports.cmd" - ], - "headless": "{{ user `headless` }}", + "type": "hyperv-iso", + "iso_url": "{{ user `iso_url` }}", "iso_checksum": "{{ user `iso_checksum` }}", "iso_checksum_type": "sha1", - "iso_url": "{{ user `iso_url` }}", - "ram_size": "{{ user `memory` }}", + "floppy_files": [ + "{{template_dir}}/floppy/win81x86-pro/Autounattend.xml", + "{{template_dir}}/floppy/00-run-all-scripts.cmd", + "{{template_dir}}/floppy/01-install-wget.cmd", + "{{template_dir}}/floppy/_download.cmd", + "{{template_dir}}/floppy/_packer_config*.cmd", + "{{template_dir}}/floppy/fixnetwork.ps1", + "{{template_dir}}/floppy/install-winrm.cmd", + "{{template_dir}}/floppy/passwordchange.bat", + "{{template_dir}}/floppy/powerconfig.bat", + "{{template_dir}}/floppy/zz-start-transports.cmd" + ], "shutdown_command": "{{ user `shutdown_command`}}", - "type": "hyperv-iso", - "vm_name": "win81x86-pro", + "communicator": "winrm", + "cpus": "{{ user `cpus` }}", + "headless": "{{ user `headless` }}", + "memory": "{{ user `memory` }}", + "disk_size": "{{user `disk_size`}}", + "vm_name": "{{user `vm_name`}}", + "winrm_username": "vagrant", "winrm_password": "vagrant", - "winrm_timeout": "10000s", - "winrm_username": "vagrant" + "winrm_timeout": "10000s" } ], "post-processors": [ { "compression_level": 1, "keep_input_artifact": false, - "output": "box/{{.Provider}}/win81x86-pro-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", + "output": "{{user `box_directory`}}{{.Provider}}/{{user `vm_name`}}{{user `vm_suffix`}}-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box", "type": "vagrant", - "vagrantfile_template": "tpl/vagrantfile-win81x86-pro.tpl" + "vagrantfile_template": "{{template_dir}}/tpl/vagrantfile-win81x86-pro.tpl" } ], "provisioners": [ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], "scripts": [ - "script/vagrant.bat", - "script/cmtool.bat", - "script/vmtool.bat", - "script/clean.bat", - "script/ultradefrag.bat", - "script/uninstall-7zip.bat", - "script/sdelete.bat" + "{{template_dir}}/script/vagrant.bat", + "{{template_dir}}/script/cmtool.bat", + "{{template_dir}}/script/vmtool.bat", + "{{template_dir}}/script/clean.bat", + "{{template_dir}}/script/ultradefrag.bat", + "{{template_dir}}/script/uninstall-7zip.bat", + "{{template_dir}}/script/sdelete.bat" ], "type": "windows-shell" } ], "variables": { - "cpus": "2", - "memory": "2048", - "guest_additions_url": "", + "vm_name": "win81x86-pro", + "vm_suffix": "", "cm": "chef", "cm_version": "", + "cpus": "2", + "memory": "2048", "disk_size": "40960", - "headless": "false", - "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254", + "hw_version": "7", "iso_url": "iso/en_windows_8.1_professional_vl_with_update_x86_dvd_4065201.iso", + "iso_checksum": "c2d6f5d06362b7cb17dfdaadfb848c760963b254", + "guest_additions_url": "", + "box_directory": "box/", "shutdown_command": "shutdown /s /t 10 /f /d p:4:1 /c \"Packer Shutdown\"", + "headless": "false", "update": "true", "version": "0.1.0" } From a34bf7ba1056e93aa140bbd6cbc0a5230ba1911f Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 09:36:22 -0500 Subject: [PATCH 30/38] sync with proxy (cherry picked from commit 6cda48c338ea24abfe60acabb5cd6906152976ad) --- floppy/_download.cmd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/floppy/_download.cmd b/floppy/_download.cmd index c9867a7e..75a5eb4b 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -80,10 +80,6 @@ powershell -command %ps1_script% >nul if not errorlevel 1 if exist "%filename%" goto exit0 -if defined DISABLE_BITS ( - if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 -) - :bitsadmin set bitsadmin= From 14d74f6b3ba316554ceda26930356799cdeda7e5 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 10:00:42 -0500 Subject: [PATCH 31/38] sync with proxy --- floppy/01-install-wget.cmd | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index 2120eb52..31d74d5b 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -16,7 +16,9 @@ call "%~dp0\_download.cmd" "%WGET_URL%" "%filename%" if exist "%filename%" goto exit0 -set bitsadmin= +if defined DISABLE_BITS ( + if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 +)set bitsadmin= for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i From 1da6bf78005876b575c9c804dcea44e9fadac9e4 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 10:02:15 -0500 Subject: [PATCH 32/38] sync with proxy --- floppy/_post_update_install.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/floppy/_post_update_install.bat b/floppy/_post_update_install.bat index a682d3cb..7fe9a5cd 100644 --- a/floppy/_post_update_install.bat +++ b/floppy/_post_update_install.bat @@ -9,7 +9,7 @@ REM want to run scripts following all updates/reboots. title Running post update scripts. Please wait... @for %%i in (%~dp0\zz*.cmd) do ( - echo ==^> Running "%%~i" + echo ==^> Running "%%~i" @call "%%~i" ) From 17f5766dfd08cbb3faff7eb442063b6a499b00b8 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 10:07:38 -0500 Subject: [PATCH 33/38] sync with proxy --- .gitignore | 6 +++--- floppy/01-install-wget.cmd | 4 +++- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/.gitignore b/.gitignore index c0f9bf7c..4235ad7d 100644 --- a/.gitignore +++ b/.gitignore @@ -12,6 +12,6 @@ Makefile.local rspec_html_reports .DS_Store -*.*.json -floppy/*.*.* -script/*.*.* + +floppy/_packer_config_*.cmd + diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index 31d74d5b..5ae1672e 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -18,7 +18,9 @@ if exist "%filename%" goto exit0 if defined DISABLE_BITS ( if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 -)set bitsadmin= +) + +`set bitsadmin= for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i From 07fc9ccb54d3f070cbbe79093ece20db7860e9fc Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 10:09:58 -0500 Subject: [PATCH 34/38] sync --- floppy/_download.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/floppy/_download.cmd b/floppy/_download.cmd index 75a5eb4b..40642a6b 100644 --- a/floppy/_download.cmd +++ b/floppy/_download.cmd @@ -46,7 +46,7 @@ if defined wget goto wget if not exist "%wget%" goto powershell -echo ==^> Downloading "%url%" to "%filename%" with "wget.exe"... +echo ==^> Downloading "%url%" to "%filename%" using "%wget%"... if not defined PACKER_DEBUG set WGET_OPTS=--no-verbose @@ -61,7 +61,7 @@ if defined http_proxy ( if not errorlevel 1 if exist "%filename%" goto exit0 :powershell -echo ==^> Downloading "%url%" to "%filename%" using Powershell... +echo ==^> Downloading "%url%" to "%filename%" using "Powershell"... if defined http_proxy ( set "ps1_proxy=$wc.proxy = (new-object System.Net.WebProxy('%http_proxy%')) ;" @@ -90,7 +90,7 @@ if not defined bitsadmin set bitsadmin=%SystemRoot%\System32\bitsadmin.exe if not exist "%bitsadmin%" goto exit 1 -echo ==^> Downloading "%url%" to "%filename%" with "BITS"... +echo ==^> Downloading "%url%" to "%filename%" using "BITS"... for %%i in ("%filename%") do set jobname=%%~nxi From 22bdeef8ccbe8f73e5342b51907970a724bd5848 Mon Sep 17 00:00:00 2001 From: Dax T Games Date: Wed, 26 Feb 2020 10:14:17 -0500 Subject: [PATCH 35/38] Update 01-install-wget.cmd --- floppy/01-install-wget.cmd | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/floppy/01-install-wget.cmd b/floppy/01-install-wget.cmd index 5ae1672e..6a45ab4a 100644 --- a/floppy/01-install-wget.cmd +++ b/floppy/01-install-wget.cmd @@ -20,7 +20,7 @@ if defined DISABLE_BITS ( if "%DISABLE_BITS%" == "1" if not exist "%filename%" goto exit1 ) -`set bitsadmin= +set bitsadmin= for %%i in (bitsadmin.exe) do set bitsadmin=%%~$PATH:i From 3fd537430c1801576f508bd3314694708dc16ed1 Mon Sep 17 00:00:00 2001 From: Dax T Games Date: Wed, 26 Feb 2020 10:15:30 -0500 Subject: [PATCH 36/38] Update _packer_config.cmd --- floppy/_packer_config.cmd | 4 ---- 1 file changed, 4 deletions(-) diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index ff53b0e7..3e273656 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -8,10 +8,6 @@ :: Default: (unset) :: set PACKER_DEBUG=1 -:: Uncomment to disable BITS so scripts can fail instead of hanging. -:: Default: (unset) -:: set DISABLE_BITS=1 - :: Uncomment the following to define the directory where scripts/save-logs.cmd :: will save the installation logs :: Default: z:\c\packer_logs From a9da09d17667c8972040dea5727075bd5f4c6b4e Mon Sep 17 00:00:00 2001 From: Dax T Games Date: Wed, 26 Feb 2020 10:15:56 -0500 Subject: [PATCH 37/38] Update _packer_config.cmd --- floppy/_packer_config.cmd | 2 -- 1 file changed, 2 deletions(-) diff --git a/floppy/_packer_config.cmd b/floppy/_packer_config.cmd index 3e273656..6ede89e2 100644 --- a/floppy/_packer_config.cmd +++ b/floppy/_packer_config.cmd @@ -51,5 +51,3 @@ set PACKER_SERVICES=opensshd sshd BvSshServer winrm :: Uncomment the following to define a new password for the sshd service :: Default: D@rj33l1ng :: set SSHD_PASSWORD=D@rj33l1ng - -exit /b From ad6ef3f274be459d14d0d831f662dc61a9dc3598 Mon Sep 17 00:00:00 2001 From: "Dax T. Games" Date: Wed, 26 Feb 2020 10:25:35 -0500 Subject: [PATCH 38/38] sync --- .gitignore | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.gitignore b/.gitignore index 4235ad7d..8ee5027e 100644 --- a/.gitignore +++ b/.gitignore @@ -13,5 +13,9 @@ rspec_html_reports .DS_Store +*.*.json +floppy/*.*.* +script/*.*.* floppy/_packer_config_*.cmd +