← Back to team overview

cloud-init-dev team mailing list archive

[Merge] lp:~craigtracey/cloud-init/puppet-optional into lp:cloud-init


Craig Tracey has proposed merging lp:~craigtracey/cloud-init/puppet-optional into lp:cloud-init.

Requested reviews:
  cloud init development team (cloud-init-dev)
Related bugs:
  Bug #1090205 in cloud-init: "Make puppet installation optional"

For more details, see:

Provide a mechanism for puppet to be conditionally installed.

Instead of always installing puppet give users the ability to opt-out.
Your team cloud init development team is requested to review the proposed merge of lp:~craigtracey/cloud-init/puppet-optional into lp:cloud-init.
=== modified file 'cloudinit/config/cc_puppet.py'
--- cloudinit/config/cc_puppet.py	2012-10-28 02:25:48 +0000
+++ cloudinit/config/cc_puppet.py	2012-12-14 02:58:22 +0000
@@ -57,8 +57,10 @@
     puppet_cfg = cfg['puppet']
-    # Start by installing the puppet package ...
-    cloud.distro.install_packages(["puppet"])
+    # Start by installing the puppet package if necessary...
+    install = util.get_cfg_option_bool(puppet_cfg, 'install', True)
+    if install:
+        cloud.distro.install_packages(["puppet"])
     # ... and then update the puppet configuration
     if 'conf' in puppet_cfg:

Follow ups