diff options
| author | Scott Moser <smoser@ubuntu.com> | 2012-08-22 14:26:35 -0400 |
|---|---|---|
| committer | Scott Moser <smoser@ubuntu.com> | 2012-08-22 14:26:35 -0400 |
| commit | 0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84 (patch) | |
| tree | 84509440ef196e5741ece308a7f806d660accbda /cloudinit/config/cc_puppet.py | |
| parent | 26dd7461ce7ce9a6cba541ece94b802df772168b (diff) | |
| parent | 451e48732ff7885502db2f8296777fa58b670f3b (diff) | |
| download | vyos-cloud-init-0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84.tar.gz vyos-cloud-init-0bc9f3aad55b6b1d50f80ef1b1688c2ceb1c8a84.zip | |
merge from trunk for pep8 fixes
Diffstat (limited to 'cloudinit/config/cc_puppet.py')
| -rw-r--r-- | cloudinit/config/cc_puppet.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/cloudinit/config/cc_puppet.py b/cloudinit/config/cc_puppet.py index 467c1496..74ee18e1 100644 --- a/cloudinit/config/cc_puppet.py +++ b/cloudinit/config/cc_puppet.py @@ -48,7 +48,8 @@ def handle(name, cfg, cloud, log, _args): # Create object for reading puppet.conf values puppet_config = helpers.DefaultingConfigParser() # Read puppet.conf values from original file in order to be able to - # mix the rest up. First clean them up (TODO is this really needed??) + # mix the rest up. First clean them up + # (TODO(harlowja) is this really needed??) cleaned_lines = [i.lstrip() for i in contents.splitlines()] cleaned_contents = '\n'.join(cleaned_lines) puppet_config.readfp(StringIO(cleaned_contents), @@ -80,7 +81,7 @@ def handle(name, cfg, cloud, log, _args): for (o, v) in cfg.iteritems(): if o == 'certname': # Expand %f as the fqdn - # TODO should this use the cloud fqdn?? + # TODO(harlowja) should this use the cloud fqdn?? v = v.replace("%f", socket.getfqdn()) # Expand %i as the instance id v = v.replace("%i", cloud.get_instance_id()) |