From c628802a5a1523fa8499cb2b483a4a6b2a2ae0e2 Mon Sep 17 00:00:00 2001 From: Roman Inflianskas Date: Mon, 1 Apr 2019 19:34:13 +0300 Subject: [PATCH] Install Salt using Salt bootstrap script Official bootstrap script written in Powershell is used. `CM_OPTIONS` are passed as arguments (see `README.md`). PS: old way of installing Salt was limited and no longer works. --- Makefile | 3 +++ README.md | 8 +++++-- eval-win10x64-enterprise-cygwin.json | 1 + eval-win10x64-enterprise-ssh.json | 1 + eval-win10x64-enterprise.json | 1 + eval-win10x86-enterprise-cygwin.json | 1 + eval-win10x86-enterprise-ssh.json | 1 + eval-win10x86-enterprise.json | 1 + eval-win2008r2-datacenter-cygwin.json | 1 + eval-win2008r2-datacenter-ssh.json | 1 + eval-win2008r2-datacenter.json | 1 + eval-win2008r2-standard-cygwin.json | 1 + eval-win2008r2-standard-ssh.json | 1 + eval-win2008r2-standard.json | 1 + eval-win2012r2-datacenter-cygwin.json | 1 + eval-win2012r2-datacenter-ssh.json | 1 + eval-win2012r2-datacenter.json | 1 + eval-win2012r2-standard-cygwin.json | 1 + eval-win2012r2-standard-ssh.json | 1 + eval-win2012r2-standard.json | 1 + eval-win2016-standard-cygwin.json | 1 + eval-win2016-standard-ssh.json | 1 + eval-win2016-standard.json | 1 + eval-win7x64-enterprise-cygwin.json | 1 + eval-win7x64-enterprise-ssh.json | 1 + eval-win7x64-enterprise.json | 1 + eval-win7x86-enterprise-cygwin.json | 1 + eval-win7x86-enterprise-ssh.json | 1 + eval-win7x86-enterprise.json | 1 + eval-win81x64-enterprise-cygwin.json | 1 + eval-win81x64-enterprise-ssh.json | 1 + eval-win81x64-enterprise.json | 1 + eval-win81x86-enterprise-cygwin.json | 1 + eval-win81x86-enterprise-ssh.json | 1 + eval-win81x86-enterprise.json | 1 + script/cmtool.bat | 31 ++++++--------------------- win2008r2-datacenter-cygwin.json | 1 + win2008r2-datacenter-ssh.json | 1 + win2008r2-datacenter.json | 1 + win2008r2-enterprise-cygwin.json | 1 + win2008r2-enterprise-ssh.json | 1 + win2008r2-enterprise.json | 1 + win2008r2-standard-cygwin.json | 1 + win2008r2-standard-ssh.json | 1 + win2008r2-standard.json | 1 + win2008r2-web-cygwin.json | 1 + win2008r2-web-ssh.json | 1 + win2008r2-web.json | 1 + win2012-datacenter-cygwin.json | 1 + win2012-datacenter-ssh.json | 1 + win2012-datacenter.json | 1 + win2012-standard-cygwin.json | 1 + win2012-standard-ssh.json | 1 + win2012-standard.json | 1 + win2012r2-datacenter-cygwin.json | 1 + win2012r2-datacenter-ssh.json | 1 + win2012r2-datacenter.json | 1 + win2012r2-standard-cygwin.json | 1 + win2012r2-standard-ssh.json | 1 + win2012r2-standard.json | 1 + win2012r2-standardcore-cygwin.json | 1 + win2012r2-standardcore-ssh.json | 1 + win2012r2-standardcore.json | 1 + win2016-standard-cygwin.json | 1 + win2016-standard-ssh.json | 1 + win2016-standard.json | 1 + win7x64-enterprise-cygwin.json | 1 + win7x64-enterprise-ssh.json | 1 + win7x64-enterprise.json | 1 + win7x64-pro-cygwin.json | 1 + win7x64-pro-ssh.json | 1 + win7x64-pro.json | 1 + win7x86-enterprise-cygwin.json | 1 + win7x86-enterprise-ssh.json | 1 + win7x86-enterprise.json | 1 + win7x86-pro-cygwin.json | 1 + win7x86-pro-ssh.json | 1 + win7x86-pro.json | 1 + win81x64-enterprise-cygwin.json | 1 + win81x64-enterprise-ssh.json | 1 + win81x64-enterprise.json | 1 + win81x64-pro-cygwin.json | 1 + win81x64-pro-ssh.json | 1 + win81x64-pro.json | 1 + win81x86-enterprise-cygwin.json | 1 + win81x86-enterprise-ssh.json | 1 + win81x86-enterprise.json | 1 + win81x86-pro-cygwin.json | 1 + win81x86-pro-ssh.json | 1 + win81x86-pro.json | 1 + 90 files changed, 102 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile index fc505b67..85b40510 100644 --- a/Makefile +++ b/Makefile @@ -91,6 +91,9 @@ 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 CM_OPTIONS + PACKER_VARS += -var 'cm_options=$(CM_OPTIONS)' +endif ifdef CM_VERSION PACKER_VARS += -var 'cm_version=$(CM_VERSION)' endif diff --git a/README.md b/README.md index c43c5f05..d2d24b07 100644 --- a/README.md +++ b/README.md @@ -75,11 +75,15 @@ Possible values for the CM variable are: * `puppet` - Install Puppet * `salt` - Install Salt -You can also specify a variable `CM_VERSION`, if supported by the -configuration management tool, to override the default of `latest`. +You can also specify a variable `CM_VERSION` for all configuration management +tools except Salt, to override the default of `latest`. The value of `CM_VERSION` should have the form `x.y` or `x.y.z`, such as `CM_VERSION := 11.12.4` +For Salt you can specify a variable `CM_OPTIONS`. This variable will be passed +to Salt bootstrap script. For information on possible values please read: +https://github.com/saltstack/salt-bootstrap/blob/stable/bootstrap-salt.ps1 + Another use for `Makefile.local` is to override the default locations for the Windows install ISO files. diff --git a/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index e7383309..bc873d99 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -171,6 +171,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win10x64-enterprise-ssh.json b/eval-win10x64-enterprise-ssh.json index 6fa9975c..6dd0b839 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -167,6 +167,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win10x64-enterprise.json b/eval-win10x64-enterprise.json index 4b563843..663210c2 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -167,6 +167,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win10x86-enterprise-cygwin.json b/eval-win10x86-enterprise-cygwin.json index beff8b50..ac751ba2 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -171,6 +171,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win10x86-enterprise-ssh.json b/eval-win10x86-enterprise-ssh.json index 475f75bb..7e3544d1 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -167,6 +167,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win10x86-enterprise.json b/eval-win10x86-enterprise.json index 07086afd..caa4d0c6 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -167,6 +167,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2008r2-datacenter-cygwin.json b/eval-win2008r2-datacenter-cygwin.json index 9acd6060..ad90d56e 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-cygwin.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index 84670f57..78051c22 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-ssh.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index 56136cd0..cd41929d 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.json @@ -146,6 +146,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index efa8325c..11d36e6d 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-cygwin.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index 7ca6d538..a072e623 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-ssh.json @@ -138,6 +138,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index b575586b..0020ef86 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index 484543d3..efed1c33 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -159,6 +159,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2012r2-datacenter-ssh.json b/eval-win2012r2-datacenter-ssh.json index c3403a97..2e50862c 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.json @@ -155,6 +155,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index 270bee26..73c9206a 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -159,6 +159,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2012r2-standard-cygwin.json b/eval-win2012r2-standard-cygwin.json index de19a022..d54cdab1 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -159,6 +159,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2012r2-standard-ssh.json b/eval-win2012r2-standard-ssh.json index 362a5262..4c340386 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.json @@ -155,6 +155,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index 89bf9566..d81391f7 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -159,6 +159,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2016-standard-cygwin.json b/eval-win2016-standard-cygwin.json index 35dbe5d2..1524f913 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -159,6 +159,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2016-standard-ssh.json b/eval-win2016-standard-ssh.json index c7b68cee..c0936fb0 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.json @@ -155,6 +155,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win2016-standard.json b/eval-win2016-standard.json index d9dddcb5..c84f76b3 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -159,6 +159,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win7x64-enterprise-cygwin.json b/eval-win7x64-enterprise-cygwin.json index d3edd9c0..6e776c04 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-enterprise-cygwin.json @@ -150,6 +150,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index 3ae8441e..db6611bd 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-enterprise-ssh.json @@ -150,6 +150,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win7x64-enterprise.json b/eval-win7x64-enterprise.json index 12933169..c633db22 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-enterprise.json @@ -150,6 +150,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index bb64d25a..53b04b3b 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-enterprise-cygwin.json @@ -150,6 +150,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index 2d6d844d..ebbce8cc 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.json @@ -145,6 +145,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win7x86-enterprise.json b/eval-win7x86-enterprise.json index 61dc103c..c4645575 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.json @@ -146,6 +146,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index 3caaec26..aeb837b3 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -151,6 +151,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win81x64-enterprise-ssh.json b/eval-win81x64-enterprise-ssh.json index 0df0912a..8fa3e948 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -151,6 +151,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win81x64-enterprise.json b/eval-win81x64-enterprise.json index c17a2bea..743fca69 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.json @@ -155,6 +155,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index 6b7df223..6eb5d31e 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -151,6 +151,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win81x86-enterprise-ssh.json b/eval-win81x86-enterprise-ssh.json index 6f04ce41..798709b2 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -147,6 +147,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/eval-win81x86-enterprise.json b/eval-win81x86-enterprise.json index af43f64b..7c19c58e 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -151,6 +151,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/script/cmtool.bat b/script/cmtool.bat index 6b15068d..233df2b2 100644 --- a/script/cmtool.bat +++ b/script/cmtool.bat @@ -139,39 +139,20 @@ goto exit0 :salt :::::::::::: -if "%CM_VERSION%" == "latest" set CM_VERSION=2015.8.8-2 - -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 - -if defined ProgramFiles(x86) ( - set SALT_URL=%SALT_64_URL% -) else ( - set SALT_URL=%SALT_32_URL% -) - -for %%i in ("%SALT_URL%") do set SALT_EXE=%%~nxi set SALT_DIR=%TEMP%\salt -set SALT_PATH=%SALT_DIR%\%SALT_EXE% - echo ==^> Creating "%SALT_DIR%" mkdir "%SALT_DIR%" pushd "%SALT_DIR%" -if exist "%SystemRoot%\_download.cmd" ( - call "%SystemRoot%\_download.cmd" "%SALT_URL%" "%SALT_PATH%" -) else ( - echo ==^> Downloading %SALT_URL% to %SALT_PATH% - powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" Downloading %SALT_URL% to %SALT_PATH% +powershell -Command "(New-Object System.Net.WebClient).DownloadFile('%SALT_URL%', '%SALT_PATH%')" Installing Salt minion -:: see http://docs.saltstack.com/en/latest/topics/installation/windows.html -"%SALT_PATH%" /S %SALT_OPTIONS% - -@if errorlevel 1 echo ==^> WARNING: Error %ERRORLEVEL% was returned by: "%SALT_PATH%" /S %SALT_OPTIONS% -ver>nul +powershell "%SALT_PATH%" %CM_OPTIONS% goto exit0 diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json index c41e37c9..e12d961e 100644 --- a/win2008r2-datacenter-cygwin.json +++ b/win2008r2-datacenter-cygwin.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json index 08ea7573..c84298a3 100644 --- a/win2008r2-datacenter-ssh.json +++ b/win2008r2-datacenter-ssh.json @@ -138,6 +138,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-datacenter.json b/win2008r2-datacenter.json index 28e39b7c..592b1b57 100644 --- a/win2008r2-datacenter.json +++ b/win2008r2-datacenter.json @@ -141,6 +141,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-enterprise-cygwin.json b/win2008r2-enterprise-cygwin.json index 3535369f..8c9f3b37 100644 --- a/win2008r2-enterprise-cygwin.json +++ b/win2008r2-enterprise-cygwin.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json index a9ef8d2f..dac4b8ea 100644 --- a/win2008r2-enterprise-ssh.json +++ b/win2008r2-enterprise-ssh.json @@ -138,6 +138,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-enterprise.json b/win2008r2-enterprise.json index a111d52c..0aa5e883 100644 --- a/win2008r2-enterprise.json +++ b/win2008r2-enterprise.json @@ -141,6 +141,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-standard-cygwin.json b/win2008r2-standard-cygwin.json index 3c8bbcf7..c3fdb689 100644 --- a/win2008r2-standard-cygwin.json +++ b/win2008r2-standard-cygwin.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json index edcfc136..ea1a5cc1 100644 --- a/win2008r2-standard-ssh.json +++ b/win2008r2-standard-ssh.json @@ -138,6 +138,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-standard.json b/win2008r2-standard.json index 440ce708..43588c57 100644 --- a/win2008r2-standard.json +++ b/win2008r2-standard.json @@ -141,6 +141,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json index 77f27943..a0bcfa57 100644 --- a/win2008r2-web-cygwin.json +++ b/win2008r2-web-cygwin.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-web-ssh.json b/win2008r2-web-ssh.json index 5baa9eba..c7ed1124 100644 --- a/win2008r2-web-ssh.json +++ b/win2008r2-web-ssh.json @@ -138,6 +138,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2008r2-web.json b/win2008r2-web.json index 215f773a..19fe0173 100644 --- a/win2008r2-web.json +++ b/win2008r2-web.json @@ -141,6 +141,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json index 784021f5..89955cd7 100644 --- a/win2012-datacenter-cygwin.json +++ b/win2012-datacenter-cygwin.json @@ -154,6 +154,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json index 95ff0edd..8ef7a28d 100644 --- a/win2012-datacenter-ssh.json +++ b/win2012-datacenter-ssh.json @@ -150,6 +150,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012-datacenter.json b/win2012-datacenter.json index 2b6c87af..39e4e37e 100644 --- a/win2012-datacenter.json +++ b/win2012-datacenter.json @@ -153,6 +153,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012-standard-cygwin.json b/win2012-standard-cygwin.json index 4ced0553..4e5c85a6 100644 --- a/win2012-standard-cygwin.json +++ b/win2012-standard-cygwin.json @@ -156,6 +156,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012-standard-ssh.json b/win2012-standard-ssh.json index 56b4d543..040661e0 100644 --- a/win2012-standard-ssh.json +++ b/win2012-standard-ssh.json @@ -150,6 +150,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012-standard.json b/win2012-standard.json index 8373ad7c..981aaffb 100644 --- a/win2012-standard.json +++ b/win2012-standard.json @@ -153,6 +153,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json index 506b13a6..679e7fb0 100644 --- a/win2012r2-datacenter-cygwin.json +++ b/win2012r2-datacenter-cygwin.json @@ -155,6 +155,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json index 3ae8ec4a..adbb5fbb 100644 --- a/win2012r2-datacenter-ssh.json +++ b/win2012r2-datacenter-ssh.json @@ -151,6 +151,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-datacenter.json b/win2012r2-datacenter.json index 074e7957..80a24836 100644 --- a/win2012r2-datacenter.json +++ b/win2012r2-datacenter.json @@ -154,6 +154,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-standard-cygwin.json b/win2012r2-standard-cygwin.json index 8aeb7fda..7b5b8119 100644 --- a/win2012r2-standard-cygwin.json +++ b/win2012r2-standard-cygwin.json @@ -154,6 +154,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-standard-ssh.json b/win2012r2-standard-ssh.json index a980b4e8..9c9384f5 100644 --- a/win2012r2-standard-ssh.json +++ b/win2012r2-standard-ssh.json @@ -151,6 +151,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-standard.json b/win2012r2-standard.json index c18197c7..a0692be4 100644 --- a/win2012r2-standard.json +++ b/win2012r2-standard.json @@ -155,6 +155,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-standardcore-cygwin.json b/win2012r2-standardcore-cygwin.json index 456a8e3c..ed18a7b4 100644 --- a/win2012r2-standardcore-cygwin.json +++ b/win2012r2-standardcore-cygwin.json @@ -155,6 +155,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json index 3d94a9f1..0b9ee4eb 100644 --- a/win2012r2-standardcore-ssh.json +++ b/win2012r2-standardcore-ssh.json @@ -151,6 +151,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2012r2-standardcore.json b/win2012r2-standardcore.json index b3c1dd0a..7e246d35 100644 --- a/win2012r2-standardcore.json +++ b/win2012r2-standardcore.json @@ -154,6 +154,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2016-standard-cygwin.json b/win2016-standard-cygwin.json index e8aaa8d0..bdecbbdb 100644 --- a/win2016-standard-cygwin.json +++ b/win2016-standard-cygwin.json @@ -159,6 +159,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2016-standard-ssh.json b/win2016-standard-ssh.json index f13b5fa5..ab6d8f8f 100644 --- a/win2016-standard-ssh.json +++ b/win2016-standard-ssh.json @@ -155,6 +155,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win2016-standard.json b/win2016-standard.json index 19274fb7..622f83b3 100644 --- a/win2016-standard.json +++ b/win2016-standard.json @@ -159,6 +159,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x64-enterprise-cygwin.json b/win7x64-enterprise-cygwin.json index 7c7a5b59..7766dd48 100644 --- a/win7x64-enterprise-cygwin.json +++ b/win7x64-enterprise-cygwin.json @@ -143,6 +143,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json index 12898ac3..1b06ec95 100644 --- a/win7x64-enterprise-ssh.json +++ b/win7x64-enterprise-ssh.json @@ -139,6 +139,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x64-enterprise.json b/win7x64-enterprise.json index e8fc11ad..8c04d4ea 100644 --- a/win7x64-enterprise.json +++ b/win7x64-enterprise.json @@ -141,6 +141,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x64-pro-cygwin.json b/win7x64-pro-cygwin.json index ff08385c..75b35fd2 100644 --- a/win7x64-pro-cygwin.json +++ b/win7x64-pro-cygwin.json @@ -146,6 +146,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x64-pro-ssh.json b/win7x64-pro-ssh.json index f7ce68de..6325b1c6 100644 --- a/win7x64-pro-ssh.json +++ b/win7x64-pro-ssh.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x64-pro.json b/win7x64-pro.json index 73d2d6eb..aa96db7c 100644 --- a/win7x64-pro.json +++ b/win7x64-pro.json @@ -141,6 +141,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x86-enterprise-cygwin.json b/win7x86-enterprise-cygwin.json index 183c3ebd..2b565a75 100644 --- a/win7x86-enterprise-cygwin.json +++ b/win7x86-enterprise-cygwin.json @@ -146,6 +146,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x86-enterprise-ssh.json b/win7x86-enterprise-ssh.json index ce941b06..cb72b346 100644 --- a/win7x86-enterprise-ssh.json +++ b/win7x86-enterprise-ssh.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x86-enterprise.json b/win7x86-enterprise.json index 3898b081..4a39a6cf 100644 --- a/win7x86-enterprise.json +++ b/win7x86-enterprise.json @@ -141,6 +141,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x86-pro-cygwin.json b/win7x86-pro-cygwin.json index d9019441..910ee84c 100644 --- a/win7x86-pro-cygwin.json +++ b/win7x86-pro-cygwin.json @@ -146,6 +146,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x86-pro-ssh.json b/win7x86-pro-ssh.json index 65ee4537..d8b105b2 100644 --- a/win7x86-pro-ssh.json +++ b/win7x86-pro-ssh.json @@ -142,6 +142,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win7x86-pro.json b/win7x86-pro.json index 69f6264b..39eb662b 100644 --- a/win7x86-pro.json +++ b/win7x86-pro.json @@ -141,6 +141,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json index a16c2d86..9c8a8c06 100644 --- a/win81x64-enterprise-cygwin.json +++ b/win81x64-enterprise-cygwin.json @@ -147,6 +147,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x64-enterprise-ssh.json b/win81x64-enterprise-ssh.json index 6e8ebca4..73777a15 100644 --- a/win81x64-enterprise-ssh.json +++ b/win81x64-enterprise-ssh.json @@ -143,6 +143,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x64-enterprise.json b/win81x64-enterprise.json index c1456e32..344c32fa 100644 --- a/win81x64-enterprise.json +++ b/win81x64-enterprise.json @@ -146,6 +146,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x64-pro-cygwin.json b/win81x64-pro-cygwin.json index 33672451..b09b2611 100644 --- a/win81x64-pro-cygwin.json +++ b/win81x64-pro-cygwin.json @@ -144,6 +144,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x64-pro-ssh.json b/win81x64-pro-ssh.json index df759d04..e2a026a7 100644 --- a/win81x64-pro-ssh.json +++ b/win81x64-pro-ssh.json @@ -140,6 +140,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x64-pro.json b/win81x64-pro.json index 56f6ed78..dde22dba 100644 --- a/win81x64-pro.json +++ b/win81x64-pro.json @@ -146,6 +146,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json index b8f2510b..f36427a5 100644 --- a/win81x86-enterprise-cygwin.json +++ b/win81x86-enterprise-cygwin.json @@ -139,6 +139,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x86-enterprise-ssh.json b/win81x86-enterprise-ssh.json index b8a1b3bf..8b120420 100644 --- a/win81x86-enterprise-ssh.json +++ b/win81x86-enterprise-ssh.json @@ -135,6 +135,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x86-enterprise.json b/win81x86-enterprise.json index 42596ccd..ff6322ed 100644 --- a/win81x86-enterprise.json +++ b/win81x86-enterprise.json @@ -138,6 +138,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x86-pro-cygwin.json b/win81x86-pro-cygwin.json index 98fd12c1..c61615c2 100644 --- a/win81x86-pro-cygwin.json +++ b/win81x86-pro-cygwin.json @@ -140,6 +140,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x86-pro-ssh.json b/win81x86-pro-ssh.json index 4990701f..ea8211c7 100644 --- a/win81x86-pro-ssh.json +++ b/win81x86-pro-ssh.json @@ -135,6 +135,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], diff --git a/win81x86-pro.json b/win81x86-pro.json index 5f717d66..90cade6a 100644 --- a/win81x86-pro.json +++ b/win81x86-pro.json @@ -138,6 +138,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ],