Merge pull request #97 from moskey71/master

add wam extraargs support
plus3it · Jan 18, 2019 · 4744985 · 4744985
2 parents 38b8b80 + 805e0d8
commit 4744985
Show file tree

Hide file tree

Showing 17 changed files with 327 additions and 255 deletions.
diff --git a/.bumpversion.cfg b/.bumpversion.cfg
@@ -1,5 +1,5 @@
 [bumpversion]
-current_version = 1.9.1
+current_version = 1.10.0
 commit = True
 message = Bumps version to {new_version}
 tag = False

diff --git a/modules/lx-autoscale/main.tf b/modules/lx-autoscale/main.tf
@@ -49,6 +49,7 @@ resource "aws_cloudformation_stack" "watchmaker-lx-autoscale" {
     WatchmakerOuPath      = "${var.WatchmakerOuPath}"
     WatchmakerAdminGroups = "${var.WatchmakerAdminGroups}"
     WatchmakerAdminUsers  = "${var.WatchmakerAdminUsers}"
+    WatchmakerExtraArgs   = "${var.WatchmakerExtraArgs}"
     CfnEndpointUrl        = "${var.CfnEndpointUrl}"
     CfnGetPipUrl          = "${var.CfnGetPipUrl}"
     CfnBootstrapUtilsUrl  = "${var.CfnBootstrapUtilsUrl}"

diff --git a/modules/lx-autoscale/variables.tf b/modules/lx-autoscale/variables.tf
@@ -242,6 +242,12 @@ variable "WatchmakerAdminUsers" {
   default     = ""
 }
 
+variable "WatchmakerExtraArgs" {
+  type        = "string"
+  description = "(Optional) Additional parameters to be passed to the Watchmaker CLI"
+  default     = ""
+}
+
 variable "CloudWatchAgentUrl" {
   type        = "string"
   description = "(Optional) S3 URL to CloudWatch Agent installer. Example: s3://amazoncloudwatch-agent/linux/amd64/latest/AmazonCloudWatchAgent.zip"

diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.params.cfn.yaml b/modules/lx-autoscale/watchmaker-lx-autoscale.params.cfn.yaml
@@ -54,6 +54,8 @@
   ParameterValue: __WATCHMAKEROUPATH__
 - ParameterKey: WatchmakerAdminGroups
   ParameterValue: __WATCHMAKERADMINGROUPS__
+- ParameterKey: WatchmakerExtraArgs
+  ParameterValue: __WATCHMAKEREXTRAARGS__
 - ParameterKey: CloudWatchAgentUrl
   ParameterValue: __CWAGENTURL__
 - ParameterKey: CloudWatchAppLogs