From fd98d3b6b7d39dd79680601bcabd8cfca44fd857 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago Date: Mon, 6 Jan 2020 03:07:21 -0600 Subject: [PATCH 1/2] Added support for specifying the CM_OPTIONS user-variable to all the templates in order to allow passing of configuration management options to the provisioning scripts. --- Makefile | 3 +++ 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 | 9 ++++++++- 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 + 89 files changed, 98 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 38e832c7..816a3507 100644 --- a/Makefile +++ b/Makefile @@ -94,6 +94,9 @@ PACKER_VARS := -var 'cm=$(CM)' -var 'version=$(BOX_VERSION)' -var 'update=$(UPDA 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/eval-win10x64-enterprise-cygwin.json b/eval-win10x64-enterprise-cygwin.json index 24cda6ba..3f0dca5c 100644 --- a/eval-win10x64-enterprise-cygwin.json +++ b/eval-win10x64-enterprise-cygwin.json @@ -172,6 +172,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 985fbbdd..e3920728 100644 --- a/eval-win10x64-enterprise-ssh.json +++ b/eval-win10x64-enterprise-ssh.json @@ -168,6 +168,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 34f3d783..cfc300dc 100644 --- a/eval-win10x64-enterprise.json +++ b/eval-win10x64-enterprise.json @@ -168,6 +168,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 64268c1b..cf05701d 100644 --- a/eval-win10x86-enterprise-cygwin.json +++ b/eval-win10x86-enterprise-cygwin.json @@ -172,6 +172,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 dd4de007..5aad1344 100644 --- a/eval-win10x86-enterprise-ssh.json +++ b/eval-win10x86-enterprise-ssh.json @@ -168,6 +168,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 ef54c218..1f60d3b6 100644 --- a/eval-win10x86-enterprise.json +++ b/eval-win10x86-enterprise.json @@ -168,6 +168,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 bcddf387..7acaad37 100644 --- a/eval-win2008r2-datacenter-cygwin.json +++ b/eval-win2008r2-datacenter-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/eval-win2008r2-datacenter-ssh.json b/eval-win2008r2-datacenter-ssh.json index b8ece41a..396de054 100644 --- a/eval-win2008r2-datacenter-ssh.json +++ b/eval-win2008r2-datacenter-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/eval-win2008r2-datacenter.json b/eval-win2008r2-datacenter.json index b1893086..a3029d4c 100644 --- a/eval-win2008r2-datacenter.json +++ b/eval-win2008r2-datacenter.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-win2008r2-standard-cygwin.json b/eval-win2008r2-standard-cygwin.json index 66722396..71aa05aa 100644 --- a/eval-win2008r2-standard-cygwin.json +++ b/eval-win2008r2-standard-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/eval-win2008r2-standard-ssh.json b/eval-win2008r2-standard-ssh.json index 7e2afedd..64326b91 100644 --- a/eval-win2008r2-standard-ssh.json +++ b/eval-win2008r2-standard-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/eval-win2008r2-standard.json b/eval-win2008r2-standard.json index 44efe951..37e35e28 100644 --- a/eval-win2008r2-standard.json +++ b/eval-win2008r2-standard.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/eval-win2012r2-datacenter-cygwin.json b/eval-win2012r2-datacenter-cygwin.json index 62d4926b..bd52065f 100644 --- a/eval-win2012r2-datacenter-cygwin.json +++ b/eval-win2012r2-datacenter-cygwin.json @@ -160,6 +160,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 36f63987..1f1d64ef 100644 --- a/eval-win2012r2-datacenter-ssh.json +++ b/eval-win2012r2-datacenter-ssh.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/eval-win2012r2-datacenter.json b/eval-win2012r2-datacenter.json index b5095c52..07a234ad 100644 --- a/eval-win2012r2-datacenter.json +++ b/eval-win2012r2-datacenter.json @@ -160,6 +160,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 694b7513..106fab70 100644 --- a/eval-win2012r2-standard-cygwin.json +++ b/eval-win2012r2-standard-cygwin.json @@ -160,6 +160,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 9321d69e..1dac24db 100644 --- a/eval-win2012r2-standard-ssh.json +++ b/eval-win2012r2-standard-ssh.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/eval-win2012r2-standard.json b/eval-win2012r2-standard.json index ee90ba54..4b6e82cd 100644 --- a/eval-win2012r2-standard.json +++ b/eval-win2012r2-standard.json @@ -160,6 +160,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 811ce689..a4b596e8 100644 --- a/eval-win2016-standard-cygwin.json +++ b/eval-win2016-standard-cygwin.json @@ -160,6 +160,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 d8a1dc73..b8443f87 100644 --- a/eval-win2016-standard-ssh.json +++ b/eval-win2016-standard-ssh.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/eval-win2016-standard.json b/eval-win2016-standard.json index 15236758..113f36ad 100644 --- a/eval-win2016-standard.json +++ b/eval-win2016-standard.json @@ -160,6 +160,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 98c67a0c..8ebbc090 100644 --- a/eval-win7x64-enterprise-cygwin.json +++ b/eval-win7x64-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-win7x64-enterprise-ssh.json b/eval-win7x64-enterprise-ssh.json index dcb13acb..94256517 100644 --- a/eval-win7x64-enterprise-ssh.json +++ b/eval-win7x64-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-win7x64-enterprise.json b/eval-win7x64-enterprise.json index 20651966..76e75742 100644 --- a/eval-win7x64-enterprise.json +++ b/eval-win7x64-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/eval-win7x86-enterprise-cygwin.json b/eval-win7x86-enterprise-cygwin.json index b4256f20..4f6801d2 100644 --- a/eval-win7x86-enterprise-cygwin.json +++ b/eval-win7x86-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-win7x86-enterprise-ssh.json b/eval-win7x86-enterprise-ssh.json index 694c46f9..085dabd0 100644 --- a/eval-win7x86-enterprise-ssh.json +++ b/eval-win7x86-enterprise-ssh.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-win7x86-enterprise.json b/eval-win7x86-enterprise.json index 435b4b48..d0fbf4c4 100644 --- a/eval-win7x86-enterprise.json +++ b/eval-win7x86-enterprise.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-win81x64-enterprise-cygwin.json b/eval-win81x64-enterprise-cygwin.json index 13990bad..96a23284 100644 --- a/eval-win81x64-enterprise-cygwin.json +++ b/eval-win81x64-enterprise-cygwin.json @@ -152,6 +152,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 0d9a7ed1..57fa5626 100644 --- a/eval-win81x64-enterprise-ssh.json +++ b/eval-win81x64-enterprise-ssh.json @@ -152,6 +152,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 b8fa3988..5fe198a1 100644 --- a/eval-win81x64-enterprise.json +++ b/eval-win81x64-enterprise.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/eval-win81x86-enterprise-cygwin.json b/eval-win81x86-enterprise-cygwin.json index 737604d9..b86543f6 100644 --- a/eval-win81x86-enterprise-cygwin.json +++ b/eval-win81x86-enterprise-cygwin.json @@ -152,6 +152,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 d4d8dc9e..53c8c987 100644 --- a/eval-win81x86-enterprise-ssh.json +++ b/eval-win81x86-enterprise-ssh.json @@ -148,6 +148,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 5d0a54b9..650c5b62 100644 --- a/eval-win81x86-enterprise.json +++ b/eval-win81x86-enterprise.json @@ -152,6 +152,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 4e267208..6886ed74 100644 --- a/script/cmtool.bat +++ b/script/cmtool.bat @@ -44,9 +44,16 @@ if "%CM%" == "chef" ( :: Deterine the other desired parameters here if not defined OMNITRUCK_PLATFORM set OMNITRUCK_PLATFORM=windows -if not defined OMNITRUCK_MACHINE_ARCH set OMNITRUCK_MACHINE_ARCH=%PROCESSOR_ARCHITECTURE% 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= diff --git a/win2008r2-datacenter-cygwin.json b/win2008r2-datacenter-cygwin.json index 3c7c10ed..a3c7538f 100644 --- a/win2008r2-datacenter-cygwin.json +++ b/win2008r2-datacenter-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/win2008r2-datacenter-ssh.json b/win2008r2-datacenter-ssh.json index 54896fa4..068b5669 100644 --- a/win2008r2-datacenter-ssh.json +++ b/win2008r2-datacenter-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/win2008r2-datacenter.json b/win2008r2-datacenter.json index d089abc5..495ab8e8 100644 --- a/win2008r2-datacenter.json +++ b/win2008r2-datacenter.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-cygwin.json b/win2008r2-enterprise-cygwin.json index e1de366e..c3b6f23c 100644 --- a/win2008r2-enterprise-cygwin.json +++ b/win2008r2-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/win2008r2-enterprise-ssh.json b/win2008r2-enterprise-ssh.json index cb9cdcaf..785325b4 100644 --- a/win2008r2-enterprise-ssh.json +++ b/win2008r2-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/win2008r2-enterprise.json b/win2008r2-enterprise.json index f74d2971..4329cc11 100644 --- a/win2008r2-enterprise.json +++ b/win2008r2-enterprise.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-cygwin.json b/win2008r2-standard-cygwin.json index 6e9a3e1b..378157e2 100644 --- a/win2008r2-standard-cygwin.json +++ b/win2008r2-standard-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/win2008r2-standard-ssh.json b/win2008r2-standard-ssh.json index 45e4c228..a4fbc501 100644 --- a/win2008r2-standard-ssh.json +++ b/win2008r2-standard-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/win2008r2-standard.json b/win2008r2-standard.json index 9d5a497c..63b84b43 100644 --- a/win2008r2-standard.json +++ b/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/win2008r2-web-cygwin.json b/win2008r2-web-cygwin.json index 559c07b4..aff04c07 100644 --- a/win2008r2-web-cygwin.json +++ b/win2008r2-web-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/win2008r2-web-ssh.json b/win2008r2-web-ssh.json index eaa7366e..51f027a8 100644 --- a/win2008r2-web-ssh.json +++ b/win2008r2-web-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/win2008r2-web.json b/win2008r2-web.json index e4b49ae7..5399d455 100644 --- a/win2008r2-web.json +++ b/win2008r2-web.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/win2012-datacenter-cygwin.json b/win2012-datacenter-cygwin.json index 86a9d7a7..c3e18834 100644 --- a/win2012-datacenter-cygwin.json +++ b/win2012-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/win2012-datacenter-ssh.json b/win2012-datacenter-ssh.json index e32d063e..6322c6f1 100644 --- a/win2012-datacenter-ssh.json +++ b/win2012-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/win2012-datacenter.json b/win2012-datacenter.json index c36e0b9b..09cbb33c 100644 --- a/win2012-datacenter.json +++ b/win2012-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/win2012-standard-cygwin.json b/win2012-standard-cygwin.json index ab223753..85c63f26 100644 --- a/win2012-standard-cygwin.json +++ b/win2012-standard-cygwin.json @@ -157,6 +157,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 dd8cfbe4..ce13765b 100644 --- a/win2012-standard-ssh.json +++ b/win2012-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/win2012-standard.json b/win2012-standard.json index be4c00a8..e3bd5668 100644 --- a/win2012-standard.json +++ b/win2012-standard.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-datacenter-cygwin.json b/win2012r2-datacenter-cygwin.json index e6863f66..bcc78acc 100644 --- a/win2012r2-datacenter-cygwin.json +++ b/win2012r2-datacenter-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/win2012r2-datacenter-ssh.json b/win2012r2-datacenter-ssh.json index 6e336087..b02554b8 100644 --- a/win2012r2-datacenter-ssh.json +++ b/win2012r2-datacenter-ssh.json @@ -152,6 +152,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 5fbf92c7..29198087 100644 --- a/win2012r2-datacenter.json +++ b/win2012r2-datacenter.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-standard-cygwin.json b/win2012r2-standard-cygwin.json index 770bcfc5..88fca750 100644 --- a/win2012r2-standard-cygwin.json +++ b/win2012r2-standard-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-standard-ssh.json b/win2012r2-standard-ssh.json index 0a45b8de..3a351065 100644 --- a/win2012r2-standard-ssh.json +++ b/win2012r2-standard-ssh.json @@ -152,6 +152,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 c5ca53a5..b09d45f2 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 4f9ccb85..e62d8635 100644 --- a/win2012r2-standardcore-cygwin.json +++ b/win2012r2-standardcore-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/win2012r2-standardcore-ssh.json b/win2012r2-standardcore-ssh.json index a9f3fad6..b36a4965 100644 --- a/win2012r2-standardcore-ssh.json +++ b/win2012r2-standardcore-ssh.json @@ -152,6 +152,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 8f44258b..6a3de8f1 100644 --- a/win2012r2-standardcore.json +++ b/win2012r2-standardcore.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-cygwin.json b/win2016-standard-cygwin.json index a70305b8..fe5ce47b 100644 --- a/win2016-standard-cygwin.json +++ b/win2016-standard-cygwin.json @@ -160,6 +160,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 7a1bea75..5265857c 100644 --- a/win2016-standard-ssh.json +++ b/win2016-standard-ssh.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/win2016-standard.json b/win2016-standard.json index b79e5d37..42233837 100644 --- a/win2016-standard.json +++ b/win2016-standard.json @@ -160,6 +160,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 63d50f5a..3498715b 100644 --- a/win7x64-enterprise-cygwin.json +++ b/win7x64-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/win7x64-enterprise-ssh.json b/win7x64-enterprise-ssh.json index d08faaff..d47bc2ad 100644 --- a/win7x64-enterprise-ssh.json +++ b/win7x64-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/win7x64-enterprise.json b/win7x64-enterprise.json index 0c331b2f..9ccf0be5 100644 --- a/win7x64-enterprise.json +++ b/win7x64-enterprise.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-cygwin.json b/win7x64-pro-cygwin.json index 316f41f9..b7b86232 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 a32a7db4..25640a12 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 5dc1355d..28c0fed0 100644 --- a/win7x64-pro.json +++ b/win7x64-pro.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-cygwin.json b/win7x86-enterprise-cygwin.json index 97dbc43f..8eb6186e 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 f08c51b4..f77e2a71 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 e7d97101..b0e651eb 100644 --- a/win7x86-enterprise.json +++ b/win7x86-enterprise.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-cygwin.json b/win7x86-pro-cygwin.json index 9b4d4d99..0760f4b3 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 59b92646..e1c0b66e 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 47849f5e..4943d855 100644 --- a/win7x86-pro.json +++ b/win7x86-pro.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/win81x64-enterprise-cygwin.json b/win81x64-enterprise-cygwin.json index 79689990..648584a5 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 7993f404..19dedb05 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 b9b36bce..fa6b7fa7 100644 --- a/win81x64-enterprise.json +++ b/win81x64-enterprise.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-pro-cygwin.json b/win81x64-pro-cygwin.json index d0f1f531..b701a5ed 100644 --- a/win81x64-pro-cygwin.json +++ b/win81x64-pro-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-pro-ssh.json b/win81x64-pro-ssh.json index eee97766..e906eeed 100644 --- a/win81x64-pro-ssh.json +++ b/win81x64-pro-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-pro.json b/win81x64-pro.json index 1a3593c3..24e67341 100644 --- a/win81x64-pro.json +++ b/win81x64-pro.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/win81x86-enterprise-cygwin.json b/win81x86-enterprise-cygwin.json index de5f5477..705aec8f 100644 --- a/win81x86-enterprise-cygwin.json +++ b/win81x86-enterprise-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-enterprise-ssh.json b/win81x86-enterprise-ssh.json index b22e846a..40f2c14a 100644 --- a/win81x86-enterprise-ssh.json +++ b/win81x86-enterprise-ssh.json @@ -136,6 +136,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 28102f03..33ee01c1 100644 --- a/win81x86-enterprise.json +++ b/win81x86-enterprise.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-pro-cygwin.json b/win81x86-pro-cygwin.json index a064ad0d..290503c1 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 97815083..0b155208 100644 --- a/win81x86-pro-ssh.json +++ b/win81x86-pro-ssh.json @@ -136,6 +136,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 4e0c4d8c..64853d31 100644 --- a/win81x86-pro.json +++ b/win81x86-pro.json @@ -139,6 +139,7 @@ { "environment_vars": [ "CM={{user `cm`}}", + "CM_OPTIONS={{user `cm_options`}}", "CM_VERSION={{user `cm_version`}}", "UPDATE={{user `update`}}" ], From a7906d3f1c4b69614cfb63e3800955586dda8636 Mon Sep 17 00:00:00 2001 From: Ali Rizvi-Santiago Date: Tue, 7 Jan 2020 22:02:34 -0600 Subject: [PATCH 2/2] Added some default placeholders for cm_options to script/cmtool.bat that hand off the cm_options to the cm's installer. However, the semantics of these can change depending on the cmtool, since not all support or need options. --- script/cmtool.bat | 3 +++ 1 file changed, 3 insertions(+) diff --git a/script/cmtool.bat b/script/cmtool.bat index 6886ed74..182a91d5 100644 --- a/script/cmtool.bat +++ b/script/cmtool.bat @@ -88,6 +88,7 @@ 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 @@ -116,6 +117,7 @@ goto exit0 :::::::::::: :puppet :::::::::::: +if not defined PUPPET_OPTIONS set PUPPET_OPTIONS=%CM_OPTIONS% :: if "%CM_VERSION%" == "latest" set CM_VERSION=3.8.7 @@ -157,6 +159,7 @@ goto exit0 :::::::::::: :salt :::::::::::: +if not defined SALT_OPTIONS set SALT_OPTIONS=%CM_OPTIONS% if "%CM_VERSION%" == "latest" set CM_VERSION=2015.8.8-2