lp:~lynxman/cloud-init/puppet-mcollective

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~cloud-init-dev/cloud-init/trunk at revision 368

Scott Moser: Needs Fixing on 2011-02-16

Diff: 125 lines (+85/-4)

2 files modified

cloudinit/CloudConfig/cc_mcollective.py (+63/-0)
cloudinit/CloudConfig/cc_puppet.py (+22/-4)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

364. By Marc Cluet on 2011-02-15

Changes to puppet module + mcollective module

363. By Scott Moser on 2011-02-07

add 'bootcmd' like 'runcmd' to cloud-config syntax for running things early

362. By Scott Moser on 2011-02-07

add apt helper routeins to CloudConfig, and use them in apt and puppet

Adding the apt helper routines to CloudConfig.
Then, make use of the following from cc_puppet and cc_apt_update_upgrade
 update_package_sources():
 install_packages(pkglist):

I'm not really terribly happy with this location for them. Their presence
here is really only because of apt-update's use of
'run-once-per-instance'.

361. By Scott Moser on 2011-02-07

add 'run_per_instance' to CloudConfig

This method aloows the caller to run easily run something
"once per instance". Its location in CloudConfig rather than
'util' is really only because it needs access to cloudinit.get_ipath_cur
to get the 'data' path.

360. By Scott Moser on 2011-02-07

rename 'datadir' key to 'data' in pathmap

359. By Scott Moser on 2011-02-07

update TODO, ChangeLog

358. By Scott Moser on 2011-02-07

make DataSourceEc2 configurable (timeout, retries), lower default retries

This lowers the default retries from 100 to 30 (1050 seconds to 105 seconds)

357. By Scott Moser on 2011-02-07

call DataSource classes with sys_cfg argument

356. By Scott Moser on 2011-02-07

add sys_cfg option to DataSource:__init__ , populate ds_cfg from it

In order to be able to configure a DataSource via system config
(ie, what is in /etc/cloud/cloud.cfg), we pass this into the DataSource
class.

The DataSource parent class will set up the 'ds_cfg' member based
on the subclass name. So, DataSourceEc2 will get:
  self.ds_cfg = sys_cfg['datasource']['Ec2']
populated for it.

355. By Scott Moser on 2011-02-07

add utility function get_cfg_by_path