Windows2016 URL changed, ca-certificates package added to preseed

ruzickap · Jul 12, 2018 · 831504f · 831504f
1 parent b5e129a
commit 831504f
Show file tree

Hide file tree

Showing 10 changed files with 14 additions and 8 deletions.
diff --git a/README.md b/README.md
@@ -199,7 +199,7 @@ NAME=my_ubuntu-14.04-server-amd64 UBUNTU_VERSION=14.04.5 UBUNTU_TYPE=server pack
 ```
 # Windows Server
 NAME=windows-server-2012-r2-standard-x64-eval WINDOWS_VERSION=2012 VIRTIO_WIN_ISO=/var/tmp/packer/virtio-win.iso ISO_CHECKSUM=6612b5b1f53e845aacdf96e974bb119a3d9b4dcb5b82e65804ab7e534dc7b4d5 ISO_URL=http://care.dlservice.microsoft.com/dl/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 packer build windows.json
-NAME=windows-server-2016-standard-x64-eval WINDOWS_VERSION=2016 VIRTIO_WIN_ISO=/var/tmp/packer/virtio-win.iso ISO_CHECKSUM=1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f ISO_URL=http://care.dlservice.microsoft.com/dl/download/1/4/9/149D5452-9B29-4274-B6B3-5361DBDA30BC/14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO packer build windows.json
+NAME=windows-server-2016-standard-x64-eval WINDOWS_VERSION=2016 VIRTIO_WIN_ISO=/var/tmp/packer/virtio-win.iso ISO_CHECKSUM=1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f ISO_URL=https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO packer build windows.json
 
 # Windows 10
 NAME=windows-10-enterprise-x64-eval WINDOWS_VERSION=10 VIRTIO_WIN_ISO=/var/tmp/packer/virtio-win.iso ISO_CHECKSUM=3d39dd9bd37db5b3c80801ae44003802a9c770a7400a1b33027ca474a1a7c691 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 packer build windows.json

diff --git a/ansible/site.yml b/ansible/site.yml
@@ -2,5 +2,8 @@
 - hosts: all
 
   roles:
-    - { role: ansible-role-virtio-win, virtio_win_iso_path: 'E:\\', when: ansible_system == 'Win32NT' and ansible_system_vendor == 'QEMU' }
-    - { role: ansible-role-my_common_defaults, when: packer_build_name | regex_search('^my_')  }
+    - role: ansible-role-virtio-win
+      virtio_win_iso_path: 'E:\\'
+      when: ansible_system == 'Win32NT' and ansible_system_vendor == 'QEMU'
+    - role: ansible-role-my_common_defaults
+      when: packer_build_name | regex_search('^my_')
diff --git a/build.sh b/build.sh
@@ -121,7 +121,7 @@ cmdline() {
             export WINDOWS_TYPE="server"
             export WINDOWS_EDITION="standard"
             export NAME="${MY_NAME}-${WINDOWS_TYPE}-${WINDOWS_VERSION}-${WINDOWS_EDITION}-${WINDOWS_ARCH}-eval"
-            export ISO_URL="http://care.dlservice.microsoft.com/dl/download/1/4/9/149D5452-9B29-4274-B6B3-5361DBDA30BC/14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO"
+            export ISO_URL="https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO"
             export ISO_CHECKSUM="1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f"
           ;;
           *windows-2012_r2*)

diff --git a/http/ubuntu-desktop/preseed.cfg b/http/ubuntu-desktop/preseed.cfg
@@ -373,7 +373,7 @@ tasksel tasksel/first multiselect ubuntu-desktop
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
-d-i pkgsel/include string openssh-server
+d-i pkgsel/include string ca-certificates openssh-server
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
 d-i pkgsel/upgrade select full-upgrade

diff --git a/http/ubuntu-server/my-preseed.cfg b/http/ubuntu-server/my-preseed.cfg
@@ -375,7 +375,7 @@ tasksel tasksel/first multiselect none
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
-d-i pkgsel/include string openssh-server python
+d-i pkgsel/include string ca-certificates openssh-server python
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
 d-i pkgsel/upgrade select full-upgrade

diff --git a/http/ubuntu-server/preseed.cfg b/http/ubuntu-server/preseed.cfg
@@ -374,7 +374,7 @@ tasksel tasksel/first multiselect none
 
 # Individual additional packages to install
 #d-i pkgsel/include string openssh-server build-essential
-d-i pkgsel/include string openssh-server
+d-i pkgsel/include string ca-certificates openssh-server
 # Whether to upgrade packages after debootstrap.
 # Allowed values: none, safe-upgrade, full-upgrade
 d-i pkgsel/upgrade select full-upgrade

diff --git a/templates/windows-10-enterprise-eval.md b/templates/windows-10-enterprise-eval.md
@@ -114,3 +114,4 @@ Installed components via Ansible playbook [win.yml](https://github.com/ruzickap/
 * https://github.com/boxcutter/windows
 * https://github.com/StefanScherer/packer-windows
 * https://github.com/hashicorp/best-practices
+* https://github.com/chef/bento/
diff --git a/templates/windows-server-2012-eval.md b/templates/windows-server-2012-eval.md
@@ -114,3 +114,4 @@ Installed components via Ansible playbook [win.yml](https://github.com/ruzickap/
 * https://github.com/boxcutter/windows
 * https://github.com/StefanScherer/packer-windows
 * https://github.com/hashicorp/best-practices
+* https://github.com/chef/bento/
diff --git a/templates/windows-server-2016-eval.md b/templates/windows-server-2016-eval.md
@@ -114,3 +114,4 @@ Installed components via Ansible playbook [win.yml](https://github.com/ruzickap/
 * https://github.com/boxcutter/windows
 * https://github.com/StefanScherer/packer-windows
 * https://github.com/hashicorp/best-practices
+* https://github.com/chef/bento/
diff --git a/windows.json b/windows.json
@@ -2,7 +2,7 @@
   "_comment": [
     "NAME=windows-10-enterprise-x64-eval WINDOWS_VERSION=10 VIRTIO_WIN_ISO=./packer_cache/virtio-win.iso ISO_CHECKSUM=27e4feb9102f7f2b21ebdb364587902a70842fb550204019d1a14b120918e455 ISO_URL=https://software-download.microsoft.com/download/pr/17134.1.180410-1804.rs4_release_CLIENTENTERPRISEEVAL_OEMRET_x64FRE_en-us.iso packer build -only=qemu windows.json",
     "NAME=windows-server-2012-r2-standard-x64-eval WINDOWS_VERSION=2012 VIRTIO_WIN_ISO=./packer_cache/virtio-win.iso ISO_CHECKSUM=6612b5b1f53e845aacdf96e974bb119a3d9b4dcb5b82e65804ab7e534dc7b4d5 ISO_URL=http://care.dlservice.microsoft.com/dl/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 packer build -only=qemu windows.json",
-    "NAME=windows-server-2016-standard-x64-eval WINDOWS_VERSION=2016 VIRTIO_WIN_ISO=./packer_cache/virtio-win.iso ISO_CHECKSUM=1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f ISO_URL=http://care.dlservice.microsoft.com/dl/download/1/4/9/149D5452-9B29-4274-B6B3-5361DBDA30BC/14393.0.161119-1705.RS1_REFRESH_SERVER_EVAL_X64FRE_EN-US.ISO packer build -only=qemu windows.json"
+    "NAME=windows-server-2016-standard-x64-eval WINDOWS_VERSION=2016 VIRTIO_WIN_ISO=./packer_cache/virtio-win.iso ISO_CHECKSUM=1ce702a578a3cb1ac3d14873980838590f06d5b7101c5daaccbac9d73f1fb50f ISO_URL=https://software-download.microsoft.com/download/pr/Windows_Server_2016_Datacenter_EVAL_en-us_14393_refresh.ISO packer build -only=qemu windows.json"
   ],
   "variables": {
     "name": "{{ env `NAME` }}",