lp:~harlowja/cloud-init/legacy-user-make-default

Branch merges

Propose for merging

No branches dependent on this one.

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

Joshua Harlow (community): Approve on 2013-01-25

Clint Byrum (community): Approve on 2013-01-23

Diff: 146 lines (+63/-32)

2 files modified

cloudinit/distros/__init__.py (+56/-29)
tests/unittests/test_distros/test_user_data_normalize.py (+7/-3)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1100920: In Ubuntu 12.10, the legacy 'user' cloud-config option is not handled properly

Medium

Fix Released

Link a bug report

Related blueprints

760. By harlowja <email address hidden> on 2013-01-20

Merge the old user style with the distro provided config.

When the old user: style entry is found, don't forget that
we need to use the distro settings that are provided but
override the name with the new name, this is now accomplished
by merging them together in the correct order (using the standard
cloud-init merging algo).

759. By Joshua Harlow on 2013-01-18

Adjust how the legacy user: XYZ config alters the normalized user list

Previously if a legacy user: XYZ entry was found, XYZ would not automatically
be promoted to the default user but would instead just be added on as a new
entry to the normalized user list. It appears the behavior that is wanted is
for the XYZ entry to be added on as the default user (thus overriding a distro
provided default user), which better matches how the code previous worked.

758. By Vlastimil Holer on 2013-01-07

Allow 'sr0' to be specified as a device for mounts

Previously cloud-config to get a '/dev/sr0' entry written to /etc/fstab
would have had to have the full /dev/sr0. This change allows cloud-config
to reference it without the '/dev/' prefix. Like:
 | mounts:
 | - [ sr0, /media/sr0 ]

757. By Gerard Dethier on 2013-01-07

DataSourceCloudStack: fallback to default route if no virtual router found

Changes in revision 753 broke cloud-init on ubuntu, as it has a different
dhclient directory than Fedora where the change was developed and tested.

This change does 2 things:
 * searches multiple directories (including /var/lib/dhcp) for the lease
   files.
 * adds a fallback to the old code path of choosing the default route
   as the virtual router if there were no virtual routers found in the
   lease files.

756. By Scott Moser on 2013-01-07

fix 'lock_password' for cloud-config user setup

This simiplifies the logic, by just making it independent of 'system'.

755. By Joshua Harlow on 2013-01-07

fix redaction of password field in log (LP: #1096417)

We were trying to avoid the user's password being written to the log, but that
was looking for the wrong option.

754. By Scott Moser on 2012-12-19

add ChangeLog entry for previous commit

753. By Gerard Dethier on 2012-12-19

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
not).

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 on 2012-12-19

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

751. By Scott Moser on 2012-12-17

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.