Merge branch 'master' of github.com:waterbear-cloud/paco

waterbear-cloud · Jan 14, 2021 · 8b00aa0 · 8b00aa0
2 parents d29ac96 + 624befe
commit 8b00aa0
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,6 +5,10 @@ Changelog for Paco
 9.2.2 (unreleased)
 ------------------
 
+### Changed
+
+- ASG launch options field `codedeploy_agent` now defaults to False.
+
 ### Fixed
 
 - `paco.sub` will now lookup the Stack Output for refs that refer to Stacks.

diff --git a/src/paco/application/ec2_launch_manager.py b/src/paco/application/ec2_launch_manager.py
@@ -1791,10 +1791,6 @@ def lb_add_codedeploy(self, bundle_name, resource):
         """Creates a launch bundle to install and configure the CodeDeploy agent"""
         # Create the Launch Bundle
         codedeploy_lb = LaunchBundle(resource, self, bundle_name)
-        codedeploy_enabled = True
-        if not resource.launch_options.codedeploy_agent:
-            codedeploy_enabled = False
-
         launch_script = f"""#!/bin/bash
 
 function stop_agent() {{
@@ -1858,7 +1854,7 @@ def lb_add_codedeploy(self, bundle_name, resource):
     yum erase codedeploy-agent -y
 }}
 """
-        codedeploy_lb.set_launch_script(launch_script, codedeploy_enabled)
+        codedeploy_lb.set_launch_script(launch_script, resource.launch_options.codedeploy_agent)
         self.add_bundle(codedeploy_lb)
 
     def process_bundles(self, resource, instance_iam_role_ref):