diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-01-17 14:41:29 -0500 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-01-17 14:41:29 -0500 |
| commit | 15e3241ba725a21604e0f3570e755a91b5edba00 (patch) | |
| tree | d84be61c3a56ddc03eb927d5de5433afacadf64b /cloudinit/CloudConfig/cc_puppet.py | |
| parent | 2f7227c7092ad873757167f62c2a82fb4ee69472 (diff) | |
| download | vyos-cloud-init-15e3241ba725a21604e0f3570e755a91b5edba00.tar.gz vyos-cloud-init-15e3241ba725a21604e0f3570e755a91b5edba00.zip | |
[PATCH] PEP8 coding style fixes.
From: Juerg Haefliger <juerg.haefliger@hp.com>
This pulls in the named patch for LP: #914739 with a few other changes.
Diffstat (limited to 'cloudinit/CloudConfig/cc_puppet.py')
| -rw-r--r-- | cloudinit/CloudConfig/cc_puppet.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/cloudinit/CloudConfig/cc_puppet.py b/cloudinit/CloudConfig/cc_puppet.py index 5fb0c1ee..6db1ed5c 100644 --- a/cloudinit/CloudConfig/cc_puppet.py +++ b/cloudinit/CloudConfig/cc_puppet.py @@ -25,16 +25,17 @@ import ConfigParser import cloudinit.CloudConfig as cc import cloudinit.util as util + def handle(_name, cfg, cloud, log, _args): # If there isn't a puppet key in the configuration don't do anything - if not cfg.has_key('puppet'): + if 'puppet' not in cfg: return puppet_cfg = cfg['puppet'] # Start by installing the puppet package ... cc.install_packages(("puppet",)) # ... and then update the puppet configuration - if puppet_cfg.has_key('conf'): + if 'conf' in puppet_cfg: # Add all sections from the conf object to puppet.conf puppet_conf_fh = open('/etc/puppet/puppet.conf', 'r') # Create object for reading puppet.conf values @@ -102,4 +103,3 @@ def handle(_name, cfg, cloud, log, _args): log.warn("Do not know how to enable puppet service on this system") # Start puppetd subprocess.check_call(['service', 'puppet', 'start']) - |