Merge pull request #149 from lorengordon/yum-local

Installs CWA using yum localinstall instead of rpm
plus3it · Aug 2, 2019 · 284e60c · 284e60c
2 parents c587c29 + 05ecbef
commit 284e60c
Show file tree

Hide file tree

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

diff --git a/modules/lx-autoscale/watchmaker-lx-autoscale.template.cfn.yaml b/modules/lx-autoscale/watchmaker-lx-autoscale.template.cfn.yaml
@@ -202,7 +202,7 @@ Metadata:
         default: Force Cfn Init Update
       ToggleNewInstances:
         default: Force New Instances
-  Version: 1.15.5
+  Version: 1.15.6
 Outputs:
   ScaleDownScheduledAction:
     Condition: UseScheduledAction
@@ -664,7 +664,7 @@ Resources:
             01-install-cloudwatch-agent:
               command: !Sub >-
                 aws s3 cp ${CloudWatchAgentUrl} /etc/cfn/scripts/amazon-cloudwatch-agent.rpm &&
-                rpm -v -U /etc/cfn/scripts/amazon-cloudwatch-agent.rpm
+                yum -y --nogpgcheck localinstall /etc/cfn/scripts/amazon-cloudwatch-agent.rpm
             03-manipulate-cloudwatch-config:
               command: >-
                 python3 /etc/cfn/scripts/aws-cw-agent/cloudwatch-applog-config.py

diff --git a/modules/lx-instance/watchmaker-lx-instance.template.cfn.yaml b/modules/lx-instance/watchmaker-lx-instance.template.cfn.yaml
@@ -153,7 +153,7 @@ Metadata:
     ParameterLabels:
       ToggleCfnInitUpdate:
         default: Force Cfn Init Update
-  Version: 1.15.5
+  Version: 1.15.6
 Outputs:
   WatchmakerInstanceId:
     Description: Instance ID
@@ -477,7 +477,7 @@ Resources:
             01-install-cloudwatch-agent:
               command: !Sub >-
                 aws s3 cp ${CloudWatchAgentUrl} /etc/cfn/scripts/amazon-cloudwatch-agent.rpm &&
-                rpm -v -U /etc/cfn/scripts/amazon-cloudwatch-agent.rpm
+                yum -y --nogpgcheck localinstall /etc/cfn/scripts/amazon-cloudwatch-agent.rpm
             03-manipulate-cloudwatch-config:
               command: >-
                 python3 /etc/cfn/scripts/aws-cw-agent/cloudwatch-applog-config.py

diff --git a/modules/win-autoscale/watchmaker-win-autoscale.template.cfn.yaml b/modules/win-autoscale/watchmaker-win-autoscale.template.cfn.yaml
@@ -192,7 +192,7 @@ Metadata:
         default: Force Cfn Init Update
       ToggleNewInstances:
         default: Force New Instances
-  Version: 1.15.5
+  Version: 1.15.6
 Outputs:
   ScaleDownScheduledAction:
     Condition: UseScheduledAction

diff --git a/modules/win-instance/watchmaker-win-instance.template.cfn.yaml b/modules/win-instance/watchmaker-win-instance.template.cfn.yaml
@@ -141,7 +141,7 @@ Metadata:
     ParameterLabels:
       ToggleCfnInitUpdate:
         default: Force Cfn Init Update
-  Version: 1.15.5
+  Version: 1.15.6
 Outputs:
   WatchmakerInstanceId:
     Description: Instance ID