lp:~harlowja/cloud-init/ug-cleanup-part-deuce

Branch merges

Propose for merging

No branches dependent on this one.

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

cloud-init Commiters: Pending requested 2012-09-28

Diff: 603 lines (+236/-95)

9 files modified

cloudinit/config/cc_byobu.py (+18/-9)
cloudinit/config/cc_set_passwords.py (+7/-10)
cloudinit/config/cc_ssh.py (+7/-10)
cloudinit/config/cc_ssh_authkey_fingerprints.py (+11/-5)
cloudinit/config/cc_ssh_import_id.py (+18/-19)
cloudinit/config/cc_users_groups.py (+5/-2)
cloudinit/distros/__init__.py (+100/-30)
cloudinit/util.py (+30/-0)
tests/unittests/test_distros/test_user_data_normalize.py (+40/-10)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

675. By Joshua Harlow on 2012-09-28

Sync with head and fix conflicts.

674. By Joshua Harlow on 2012-09-28

Make byobu more tolerant of the user not being
located and warn when it is not found + only
run the shell command when actual contents
exist to run.

673. By Joshua Harlow on 2012-09-28

Add a comment as to why distros can't be
imported without being renamed due to
previous usage of the attribute 'distros'

672. By Joshua Harlow on 2012-09-28

Rework the rest of the locations that used
the previous 'user' and make those locations
go through the new distros functions to select
the default user or the user list (depending on usage).

Adjust the tests to check the new 'default' field
that signifies the default user + test the new method
to extract just the default user from a normalized
user dictionary.

671. By Scott Moser on 2012-09-28

restart salt-minion instead of start.

Packages on debian/ubuntu should start on installation. As a result, if we
want to get config changes we've inserted to be read, we need to restart.

Note one interesting thing here.
upstart considers 'restart' as "restart only if currently running", while
'service' considers restart to be "stop if running, then start". So the use of
'service' here is important, rather than just 'restart'

670. By Joshua Harlow on 2012-09-28

cleanup the user/group lists

The primary utility here is normalize_user_groups, which would
be called by config modules to get a list of users or groups.
This centralizes what was copied code into this one location.

669. By Joshua Harlow on 2012-09-25

add tests for netcfg code

668. By Joshua Harlow on 2012-09-25

cleanups for rhel network config

Rework the rhel sysconfig writing/updating so that it goes through a
single function which helps ensure correctness. Also write to
/etc/sysconfig/network when we have written out devices to ensure that
networking is on.

667. By Joshua Harlow on 2012-09-25

handle ifup on RH distros by iterating over 'ifup devname'

Fix the ifup so that if a list of devices is provided then each interface is
brought up individually instead of using the '--all' which isn't on rhel.

The default debian behavior will be to use this still though as it overrides
the new bring up interfaces function for this case.

666. By Scott Moser on 2012-09-24

DataSourceMAAS: if a oauth request fails due to 403 try updating local time

In the event of a 403 (Unauthorized) in oauth, try set a 'oauth_clockskew'
variable. In future headers, use a time created by 'time.time() +
self.oauth_clockskew'. The idea here is that if the local time is bad (or even
if the server time is bad) we will essentially use something that should be
similar to the remote clock.

This fixes LP: #978127.