Remove references to ssh in winrm builds

This is in these 2 places: - output filename in the vagrant postprocessor (i.e. after ~45 minutes of building the machine: "why the hell is my WinRM machine named something-ssh-something? did I choose the wrong template?" :-) - template used in the vagrant postprocessor However in win2012r2-standardcore, `ssh` was also in the path to `Autounattend.xml` that is used for the floppy. What is more, the ssh path reference there however does not exist.
fokk · Nov 21, 2015 · 163e4af · 163e4af
1 parent c479928
commit 163e4af
Show file tree

Hide file tree

Showing 26 changed files with 54 additions and 54 deletions.
diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json
@@ -136,9 +136,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win10x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win10x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win10x64-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json
@@ -133,9 +133,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win10x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win10x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win10x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win10x86-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json
@@ -129,9 +129,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2008r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win2008r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-datacenter-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-datacenter.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json
@@ -126,9 +126,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2008r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win2008r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-standard-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win2008r2-standard.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json
@@ -139,9 +139,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2012r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win2012r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-datacenter-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-datacenter.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json
@@ -139,9 +139,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win2012r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win2012r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-standard-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win2012r2-standard.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json
@@ -132,9 +132,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win7x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win7x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win7x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win7x64-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json
@@ -129,9 +129,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win7x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win7x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win7x86-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json
@@ -136,9 +136,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win81x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win81x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win81x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win81x64-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json
@@ -133,9 +133,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win81x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win81x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win81x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win81x86-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/eval-win8x64-enterprise.json b/eval-win8x64-enterprise.json
@@ -129,9 +129,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/eval-win8x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/eval-win8x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-eval-win8x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-eval-win8x64-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json
@@ -126,9 +126,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2008r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-datacenter-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2008r2-datacenter.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json
@@ -126,9 +126,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2008r2-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2008r2-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2008r2-standard.json b/win2008r2-standard.json
@@ -126,9 +126,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2008r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-standard-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2008r2-standard.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2008r2-web.json b/win2008r2-web.json
@@ -126,9 +126,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2008r2-web-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2008r2-web-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2008r2-web-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2008r2-web.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2012-datacenter.json b/win2012-datacenter.json
@@ -135,9 +135,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2012-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012-datacenter-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2012-datacenter.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2012-standard.json b/win2012-standard.json
@@ -135,9 +135,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2012-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012-standard-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2012-standard.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json
@@ -136,9 +136,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-datacenter-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2012r2-datacenter-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-datacenter-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2012r2-datacenter.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2012r2-standard.json b/win2012r2-standard.json
@@ -136,9 +136,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-standard-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2012r2-standard-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standard-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standard.tpl"
     }
   ],
   "provisioners": [

diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json
@@ -12,7 +12,7 @@
         "floppy/install-winrm.cmd",
         "floppy/passwordchange.bat",
         "floppy/powerconfig.bat",
-        "floppy/win2012r2-standardcore-ssh/Autounattend.xml",
+        "floppy/win2012r2-standardcore/Autounattend.xml",
         "floppy/zz-start-sshd.cmd"
       ],
       "guest_os_type": "windows8srv-64",
@@ -47,7 +47,7 @@
         "floppy/oracle-cert.cer",
         "floppy/passwordchange.bat",
         "floppy/powerconfig.bat",
-        "floppy/win2012r2-standardcore-ssh/Autounattend.xml",
+        "floppy/win2012r2-standardcore/Autounattend.xml",
         "floppy/zz-start-sshd.cmd"
       ],
       "guest_os_type": "Windows2012_64",
@@ -136,9 +136,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win2012r2-standardcore-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win2012r2-standardcore-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standardcore-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win2012r2-standardcore.tpl"
     }
   ],
   "provisioners": [

diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json
@@ -126,9 +126,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win7x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win7x64-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json
@@ -126,9 +126,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win7x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win7x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win7x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win7x86-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json
@@ -130,9 +130,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win81x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win81x64-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json
@@ -124,9 +124,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win81x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win81x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win81x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win81x86-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/win8x64-enterprise.json b/win8x64-enterprise.json
@@ -129,9 +129,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x64-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win8x64-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x64-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win8x64-enterprise.tpl"
     }
   ],
   "provisioners": [

diff --git a/win8x86-enterprise.json b/win8x86-enterprise.json
@@ -123,9 +123,9 @@
     {
       "compression_level": 1,
       "keep_input_artifact": false,
-      "output": "box/{{.Provider}}/win8x86-enterprise-ssh-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
+      "output": "box/{{.Provider}}/win8x86-enterprise-{{user `cm`}}{{user `cm_version`}}-{{user `version`}}.box",
       "type": "vagrant",
-      "vagrantfile_template": "tpl/vagrantfile-win8x86-enterprise-ssh.tpl"
+      "vagrantfile_template": "tpl/vagrantfile-win8x86-enterprise.tpl"
     }
   ],
   "provisioners": [