Created by Joshua Harlow and last modified
Get this branch:
bzr branch lp:~harlowja/cloud-init/fix-redact
Only Joshua Harlow can upload to this branch. If you are Joshua Harlow please log in for upload directions.

Branch merges

Related bugs

Related blueprints

Branch information

Joshua Harlow

Recent revisions

755. By Joshua Harlow

Make which fields are redacted come from a field array.

754. By Scott Moser

add ChangeLog entry for previous commit

753. By Gerard Dethier

DataSourceCloudStack: use virtual router rather than default route

In CloudStack's documentation, it is stated that meta/user-data can be
retrieved from CloudStack's Virtual Router [1].

However, cloud-init retrieves these information from default gateway. VR
and default gateway may be the same machine (i.e. have the same address)
in some cases, but that is not be always true (actually, in my case, it is

This change searches the lease files in /var/lib/dhclient to pick out
the dhcp-server-identifier.

It admittedly does make this specific to dhclient.

[1] http://incubator.apache.org/cloudstack/docs/en-US/Apache_CloudStack/4.0.0-incubating/html/Admin_Guide/user-data-and-meta-data.html).

752. By Scott Moser

cloudinit/handlers/upstart_job.py: pep8 / trailing whitespace

751. By Scott Moser

tell upstart to reload configuration after writing an upstart job

Invoking 'initctl reload-configuration' is only required if inotify
does not work. overlayroot does not support inotify. So, we just
call initctl always, which wont hurt anything.

750. By Joshua Harlow

ensure a datasource's 'distro' and sys_cfg are updated

After parsing and merging datasource's config, the changes in were not making
it into the datasource's 'distro.

The end result was that the when a config module was called, it's 'cloud'
argument would be updated in 'cloud.distro', but not in
'cloud.datasource.distro'. This path was required for getting mirror settings
to take affect, because they include information from the datasource.

  cc_apt_configure had
    mirror_info = cloud.datasource.get_package_mirror_info()
  the datasource then used *its* copy of sys_cfg to call
  and *that* distro's sys_cfg had not been updated.

749. By Scott Moser

Add 'omnibus' install mode for chef

This adds 'omnibus' to the values supported for chef's "omnibus_url" config
option. It also:
 * makes 'omnibus_url' configurable in cloud-config.
 * adds a 'force_install' flag, to allow the install code to
   act even if /usr/bin/chef-client is already present.

748. By Craig Tracey

Provide a mechanism for puppet to be conditionally installed.

Instead of always installing puppet give users the ability to opt-out.

747. By Scott Moser

cloudinit/stages.py: separate _read_base_cfg() into static function

The Init._read_base_cfg() was really a static function, this just moves
it to its own static function. Its not used anywhere else at the moment.

746. By Joshua Harlow

write-ssh-key-fingerprints: use logger -s rather than --stderr

--stderr would be preferred for readability, but older versions of
logger do not support the long form. Use the short form for compatibility.

Branch metadata

Branch format:
Branch format 7
Repository format:
Bazaar repository format 2a (needs bzr 1.16 or later)
Stacked on:
This branch contains Public information 
Everyone can see this information.